Refactor code layout

[pti/o2.git] / tests / conftest.py

diff --git a/tests/conftest.py b/tests/conftest.py
index e06fa1c..60f3d2e 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -14,13 +14,15 @@ from sqlalchemy.orm import sessionmaker, clear_mappers
 from tenacity import retry, stop_after_delay\r
 from unittest.mock import MagicMock\r
 \r
-from o2ims import config\r
+from o2common.config import config\r
+\r
 from o2ims.adapter.orm import metadata, start_o2ims_mappers\r
-from o2ims.adapter.clients.orm_stx import start_o2ims_stx_mappers\r
-from o2ims.adapter import unit_of_work\r
-# from o2ims.views.ocloud_route import configure_routes\r
+# from o2ims.adapter.clients.orm_stx import start_o2ims_stx_mappers\r
+\r
+from o2app.adapter import unit_of_work\r
 from o2ims.views.ocloud_route import configure_namespace\r
-from o2ims.bootstrap import bootstrap\r
+\r
+from o2app.bootstrap import bootstrap\r
 \r
 \r
 @pytest.fixture\r
@@ -37,7 +39,6 @@ def mock_flask_uow(mock_uow):
     # app.config["TESTING"] = True\r
     api = Api(app)\r
     bus = bootstrap(False, uow)\r
-    # configure_routes(app, bus)\r
     configure_namespace(api, bus)\r
     client = app.test_client()\r
     return session, client\r
@@ -76,7 +77,6 @@ def sqlite_flask_uow(sqlite_uow):
     # app.config["TESTING"] = True\r
     api = Api(app)\r
     bus = bootstrap(False, sqlite_uow)\r
-    # configure_routes(app, bus)\r
     configure_namespace(api, bus)\r
     yield app.test_client()\r
 \r
@@ -84,7 +84,7 @@ def sqlite_flask_uow(sqlite_uow):
 @pytest.fixture\r
 def mappers():\r
     start_o2ims_mappers()\r
-    start_o2ims_stx_mappers()\r
+    # start_o2ims_stx_mappers()\r
     yield\r
     clear_mappers()\r
 \r
@@ -136,7 +136,6 @@ def postgres_flask_uow(postgres_uow):
     app = Flask(__name__)\r
     api = Api(app)\r
     bus = bootstrap(False, postgres_uow)\r
-    # configure_routes(app, bus)\r
     configure_namespace(api, bus)\r
     yield app.test_client()\r
 \r