f

geoportal/tests/functional/test_entry.py

@@ -96,7 +96,7 @@ def setup_method(self, _):
         a_geo_table.drop(checkfirst=True, bind=engine)
         a_geo_table.create(bind=engine)
 
-        ogcserver = create_default_ogcserver()
+        ogcserver = create_default_ogcserver(DBSession)
 
         private_layer_edit = LayerWMS(name="__test_private_layer_edit", public=False)
         private_layer_edit.layer = "__test_private_layer"

geoportal/tests/functional/test_functionalities.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@ def setup_method(self, _):
         from c2cgeoportal_commons.models.main import Functionality, Role
         from c2cgeoportal_commons.models.static import User
 
-        create_default_ogcserver()
+        create_default_ogcserver(DBSession)
         role1 = Role(name="__test_role1")
         user1 = User(username="__test_user1", password="__test_user1", settings_role=role1, roles=[role1])
         role2 = Role(name="__test_role2")

geoportal/tests/functional/test_layers.py

@@ -71,7 +71,7 @@ def setup_method(self, _: Any) -> None:
         DBSession.add(self.role)
         DBSession.add(self.main)
 
-        create_default_ogcserver()
+        create_default_ogcserver(DBSession)
 
         transaction.commit()
 

geoportal/tests/functional/test_mapserverproxy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -136,7 +136,7 @@ def setup_method(self, _):
 
         setup_db()
 
-        ogc_server_internal = create_default_ogcserver()
+        ogc_server_internal = create_default_ogcserver(DBSession)
         ogcserver_geoserver = OGCServer(name="__test_ogc_server_geoserver")
         ogcserver_geoserver.url = mapserv_url
         ogcserver_geoserver.type = OGCSERVER_TYPE_GEOSERVER

geoportal/tests/functional/test_mapserverproxy_capabilities.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@ def setup_method(self, _):
         from c2cgeoportal_commons.models.static import User
 
         setup_db()
-        create_default_ogcserver()
+        create_default_ogcserver(DBSession)
 
         ogcserver_jpeg = OGCServer(name="__test_ogc_server_jpeg")
         ogcserver_jpeg.url = mapserv_url

geoportal/tests/functional/test_mapserverproxy_group.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@ def setup_method(self, _):
         from c2cgeoportal_commons.models.main import Interface, LayerWMS, RestrictionArea, Role
         from c2cgeoportal_commons.models.static import User
 
-        ogc_server_internal = create_default_ogcserver()
+        ogc_server_internal = create_default_ogcserver(DBSession)
 
         role1 = Role(name="__test_role1", description="__test_role1")
         user1 = User(username="__test_user1", password="__test_user1", settings_role=role1, roles=[role1])

geoportal/tests/functional/test_mobile_desktop.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@ def setup_method(self, _):
         from c2cgeoportal_commons.models import DBSession
         from c2cgeoportal_commons.models.main import Interface, LayerGroup, LayerWMS, Theme
 
-        create_default_ogcserver()
+        create_default_ogcserver(DBSession)
         main = Interface(name="main")
         mobile = Interface(name="mobile")
 

geoportal/tests/functional/test_themes.py

@@ -30,7 +30,6 @@
 
 import pytest
 import transaction
-from pyramid import testing
 from tests.functional import create_dummy_request
 
 
@@ -54,7 +53,6 @@ def themes_setup(dbsession, default_ogcserver):
     mobile = Interface(name="mobile")
     min_levels = Interface(name="min_levels")
 
-    ogc_server_internal = default_ogcserver(dbsession)
     ogc_server_external = OGCServer(
         name="__test_ogc_server_chtopo",
         url="http://wms.geo.admin.ch/",
@@ -67,7 +65,7 @@ def themes_setup(dbsession, default_ogcserver):
     layer_internal_wms.layer = "__test_layer_internal_wms"
     layer_internal_wms.interfaces = [main, min_levels]
     layer_internal_wms.metadatas = [Metadata("test", "internal_wms")]
-    layer_internal_wms.ogc_server = ogc_server_internal
+    layer_internal_wms.ogc_server = default_ogcserver
 
     layer_external_wms = LayerWMS(
         name="__test_layer_external_wms", layer="ch.swisstopo.dreiecksvermaschung", public=True

geoportal/tests/functional/test_themes_dimensions.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2023, Camptocamp SA
+# Copyright (c) 2016-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@ def setup_method(self, _):
             Theme,
         )
 
-        ogc_server = create_default_ogcserver()
+        ogc_server = create_default_ogcserver(DBSession)
         main = Interface(name="main")
 
         layer_wms_1 = LayerWMS(name="__test_layer_wms_1", public=True)

geoportal/tests/functional/test_themes_edit_columns.py

@@ -75,7 +75,7 @@ def setup_method(self, _: Any) -> None:
         )
         self.main = Interface(name="main")
 
-        self.ogc_server = create_default_ogcserver()
+        self.ogc_server = create_default_ogcserver(DBSession)
         self.ogc_server.auth = OGCSERVER_AUTH_NOAUTH
 
         self.metadata = None

geoportal/tests/functional/test_themes_editing.py

@@ -63,7 +63,7 @@ def setup_method(self, _):
 
         setup_db()
 
-        ogcserver = create_default_ogcserver()
+        ogcserver = create_default_ogcserver(DBSession)
 
         role1 = Role(name="__test_role1")
         user1 = User(username="__test_user1", password="__test_user1", settings_role=role1, roles=[role1])

geoportal/tests/functional/test_themes_entry.py

@@ -97,7 +97,7 @@ def setup_method(self, _):
         a_geo_table.drop(checkfirst=True, bind=engine)
         a_geo_table.create(bind=engine)
 
-        ogcserver = create_default_ogcserver()
+        ogcserver = create_default_ogcserver(DBSession)
 
         private_layer_edit = LayerWMS(name="__test_private_layer_edit", public=False)
         private_layer_edit.layer = "__test_private_layer"

geoportal/tests/functional/test_themes_layermultinameerror.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@ def setup_method(self, _):
 
         main = Interface(name="desktop")
 
-        ogc_server = create_default_ogcserver()
+        ogc_server = create_default_ogcserver(DBSession)
 
         layer_wms_1 = LayerWMS(name="__test_layer_wms_1", public=True)
         layer_wms_1.layer = "testpoint_unprotected"

geoportal/tests/functional/test_themes_loop.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@ def setup_method(self, _):
         from c2cgeoportal_commons.models import DBSession
         from c2cgeoportal_commons.models.main import Interface, LayerGroup, LayerWMS, Theme
 
-        ogc_server = create_default_ogcserver()
+        ogc_server = create_default_ogcserver(DBSession)
         main = Interface(name="desktop2")
 
         layer = LayerWMS(name="__test_layer", public=True)

geoportal/tests/functional/test_themes_metadata.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@ def setup_method(self, _):
 
         desktop = Interface(name="desktop")
 
-        ogc_server_internal = create_default_ogcserver()
+        ogc_server_internal = create_default_ogcserver(DBSession)
 
         layer_wms = LayerWMS(name="__test_layer_internal_wms", public=True)
         layer_wms.layer = "testpoint_unprotected"

geoportal/tests/functional/test_themes_mixed.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2023, Camptocamp SA
+# Copyright (c) 2016-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@ def setup_method(self, _):
 
         main = Interface(name="main")
 
-        ogc_server_internal = create_default_ogcserver()
+        ogc_server_internal = create_default_ogcserver(DBSession)
         ogc_server_external = OGCServer(
             name="__test_ogc_server_external",
             url="https://wms.geo.admin.ch/",

geoportal/tests/functional/test_themes_nameerror.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@ def setup_method(self, _):
 
         main = Interface(name="desktop")
 
-        ogc_server = create_default_ogcserver()
+        ogc_server = create_default_ogcserver(DBSession)
 
         layer_wms = LayerWMS(name="__test_layer_wms", public=True)
         layer_wms.layer = "testpoint_unprotected"

geoportal/tests/functional/test_themes_ogc_server_cache_clean.py

@@ -182,7 +182,7 @@ def setup_method(self, _):
 
         main = Interface(name="desktop")
 
-        ogc_server_internal = create_default_ogcserver()
+        ogc_server_internal = create_default_ogcserver(DBSession)
 
         layer_internal_wms = LayerWMS(name="__test_layer_internal_wms", public=True)
         layer_internal_wms.layer = "__test_layer_internal_wms"

geoportal/tests/functional/test_themes_private.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@ def setUp(self):  # noqa
         role2 = Role(name="__test_role2")
         user2 = User(username="__test_user2", password="__test_user", settings_role=role, roles=[role, role2])
         user2.email = "[email protected]"
-        ogc_server_internal = create_default_ogcserver()
+        ogc_server_internal = create_default_ogcserver(DBSession)
 
         layer_wms = LayerWMS(name="__test_layer_wms", public=True)
         layer_wms.layer = "__test_public_layer"

geoportal/tests/functional/test_themes_scale.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@ def setup_method(self, _):
 
         main = Interface(name="desktop")
 
-        ogc_server = create_default_ogcserver()
+        ogc_server = create_default_ogcserver(DBSession)
 
         layer_noscale = LayerWMS(name="__test_layer_noscale", public=True)
         layer_noscale.layer = "test_noscale"

geoportal/tests/functional/test_themes_time.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023, Camptocamp SA
+# Copyright (c) 2013-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@ def setup_method(self, _):
         DBSession.query(PointTest).delete()
 
         main = Interface(name="desktop")
-        ogc_server = create_default_ogcserver()
+        ogc_server = create_default_ogcserver(DBSession)
 
         layer_wms_1 = LayerWMS(name="__test_layer_time_1", public=True)
         layer_wms_1.layer = "test_wmstime"

geoportal/tests/functional/test_tinyowsproxy.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2023, Camptocamp SA
+# Copyright (c) 2015-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -89,7 +89,7 @@ def setup_method(self, _):
         user2.roles = [role2]
         user2.email = "Tarenpion"
 
-        ogc_server_internal = create_default_ogcserver()
+        ogc_server_internal = create_default_ogcserver(DBSession)
 
         main = Interface(name="main")
 
@@ -304,12 +304,14 @@ class TestTinyOWSProxyViewNoDb(TestCase):
     transaction_insert_request_file = data_base + "tinyows_transaction_insert_request.xml"
 
     def setup_method(self, _):
+        from c2cgeoportal_commons.models import DBSession
+
         # Always see the diff
         # https://docs.python.org/2/library/unittest.html#unittest.TestCase.maxDiff
         self.maxDiff = None
 
         cleanup_db()
-        create_default_ogcserver()
+        create_default_ogcserver(DBSession)
 
     def teardown_method(self, _):
         cleanup_db()