Skip to content

Commit

Permalink
Upgrade to GeoMapFish 2.7.0.156
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Dec 21, 2022
1 parent 71237a0 commit 8cc7e5b
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 25 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ __pycache__/
/mapserver/tinyows.xml
/yandex
/node_modules

/geodata-os
/geodata-os-new
4 changes: 0 additions & 4 deletions CONST_create_template/ci/config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/master/c2cciutils/schema.json

checks:
black: False
isort: False
prettier: False
codespell: False
eof: False
required_workflows: False
dependabot_config: False
prospector_config: False
Expand Down
2 changes: 1 addition & 1 deletion CONST_create_template/ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c2cciutils[checks,publish]==1.4.0
c2cciutils[checks,publish]==1.4.3
34 changes: 15 additions & 19 deletions CONST_create_template/tests/test_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,29 @@


@pytest.mark.parametrize(
"url,params",
"url,params,timeout",
[
("https://front", {}),
("https://front/themes", {}),
("https://front/static-geomapfish/0/locales/fr.json", {}),
("https://front/dynamic.json", {"interface": "desktop"}),
("https://front/dynamic.json", {"interface": "desktop", "query": "", "path": "/"}),
("https://front/c2c/health_check", {}),
("https://front/c2c/health_check", {"max_level": "1"}),
("https://front/c2c/health_check", {"checker": "check_collector"}),
("https://front/admin/layertree", {}),
("https://front/admin/layertree/children", {}),
("http://mapserver:8080/mapserv_proxy", {"SERVICE": "WMS", "REQUEST": "GetCapabilities"}),
("https://front", {}, 10),
("https://front/themes", {}, 120),
("https://front/static-geomapfish/0/locales/fr.json", {}, 2),
("https://front/dynamic.json", {"interface": "desktop"}, 10),
("https://front/dynamic.json", {"interface": "desktop", "query": "", "path": "/"}, 10),
("https://front/c2c/health_check", {}, 2),
("https://front/c2c/health_check", {"max_level": "1"}, 2),
("https://front/c2c/health_check", {"checker": "check_collector"}, 2),
("https://front/admin/layertree", {}, 10),
("https://front/admin/layertree/children", {}, 10),
("http://mapserver:8080/mapserv_proxy", {"SERVICE": "WMS", "REQUEST": "GetCapabilities"}, 60),
(
"https://front/mapserv_proxy",
{"ogcserver": "source for image/png", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
60,
),
],
)
def test_url(url: str, params: Dict[str, str]) -> None:
def test_url(url: str, params: Dict[str, str], timeout: int) -> None:
"""Tests that some URL didn't return an error."""
for _ in range(6):
response = requests.get(url, params=params, verify=False, timeout=10) # nosec
if response.status_code == 503:
time.sleep(1)
continue
break
response = requests.get(url, params=params, verify=False, timeout=timeout) # nosec
assert response.status_code == 200, response.text


Expand Down
2 changes: 1 addition & 1 deletion ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c2cciutils[checks,publish]==1.4.0
c2cciutils[checks,publish]==1.4.3

0 comments on commit 8cc7e5b

Please sign in to comment.