Update from base branch

From the artifact of the previous workflow run
camptocamp · Nov 27, 2024 · 95419ce · 95419ce
1 parent ed7315a
commit 95419ce
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 100 deletions.
diff --git a/create.diff b/create.diff
diff --git a/env.default b/env.default
@@ -1,5 +1,5 @@
 # Default values for c2cgeoportal
-GEOMAPFISH_VERSION=2.9.rc.11
+GEOMAPFISH_VERSION=2.9.rc.10
 GEOMAPFISH_MAIN_VERSION=2.9
 GEOMAPFISH_MAIN_MINOR_VERSION=2.9.0
 COMPOSE_PROJECT_NAME=geomapfish

diff --git a/env.project b/env.project
@@ -63,7 +63,7 @@ AWS_DEFAULT_REGION=ch-dk-2
 AWS_S3_ENDPOINT=sos-ch-dk-2.exo.io
 
 # Set a strong password here for authentication on technical interfaces behind path /c2c
-C2C_SECRET=
+C2C_SECRET=1234
 # Or use connection via GitHub, see: https://camptocamp.github.io/c2cgeoportal/2.8/integrator/c2cwsgiutils.html#authentication
 C2C_AUTH_GITHUB_REPOSITORY=camptocamp/demo_geomapfish
 C2C_AUTH_GITHUB_ACCESS_TYPE=admin

diff --git a/tests/test_app.py b/tests/test_app.py
@@ -15,7 +15,6 @@
         ("https://front/c2c/health_check", {}, 2),
         ("https://front/c2c/health_check", {"max_level": "1"}, 2),
         ("https://front/c2c/health_check", {"checker": "check_collector"}, 2),
-<<<<<<< ours
         ("http://mapserver:8080/mapserv_proxy", {"SERVICE": "WMS", "REQUEST": "GetCapabilities"}, 60),
         (
             "https://front/mapserv_proxy",
@@ -25,51 +24,8 @@
         (
             "https://front/mapserv_proxy",
             {"ogcserver": "QGIS server", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
-=======
-        ("https://front/admin/layertree", {}, 10),
-        ("https://front/admin/layertree/children", {}, 10),
-        (
-            "http://mapserver:8080/mapserv_proxy/mapserver",
-            {"SERVICE": "WMS", "REQUEST": "GetCapabilities"},
-            60,
-        ),
-        (
-            "https://front/mapserv_proxy",
-            {"ogcserver": "mapserver", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
->>>>>>> theirs
             60,
         ),
-        # (
-        #     "http://qgisserver:8080/mapserv_proxy/",
-        #     {"SERVICE": "WMS", "REQUEST": "GetCapabilities", "MAP": "/etc/qgisserver/project.qgs"},
-        #     60,
-        # ),
-        # (
-        #     "https://front/mapserv_proxy",
-        #     {"ogcserver": "qgisserver", "SERVICE": "WMS", "REQUEST": "GetCapabilities"},
-        #     60,
-        # ),
-        # OGC API - Features
-        # (
-        #     "http://mapserver:8080/mapserv_proxy/mapserver/ogcapi/collections/osm_protected/items",
-        #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
-        #     60,
-        # ),
-        # (
-        #     "https://front/mapserv_proxy/mapserver/mapserver/ogcapi/collections/osm_open/items",
-        #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
-        #     60,
-        # ),
-        # (
-        #     "http://qgisserver:8080/mapserv_proxy/qgisserver/wfs3/collections/points/items",
-        #     {"map": "/etc/qgisserver/project.qgs", "bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
-        #     60,
-        # ),
-        # (
-        #     "https://front/mapserv_proxy/qgisserver/wfs3/collections/points/items",
-        #     {"bbox": "6.0,46.0,7.0,47.0", "limit": "100"},
-        #     60,
-        # ),
     ],
 )
 def test_url(url: str, params: dict[str, str], timeout: int) -> None: