X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tests%2Fconftest.py;h=a1655b461bc664810df51e4f35e46514fb56db43;hb=6c304dfab28ffd1bbe69b9ada3d11e8fbbde014b;hp=a3359a9ec943c28256295c55288f4785d653b0eb;hpb=de778bc19d9329d3c1c3c536bfd702423102277b;p=pti%2Fo2.git

diff --git a/tests/conftest.py b/tests/conftest.py
index a3359a9..a1655b4 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -14,12 +14,15 @@ from sqlalchemy.orm import sessionmaker, clear_mappers
 from tenacity import retry, stop_after_delay
 from unittest.mock import MagicMock
 
-from o2ims import config
+from o2common.config import config
+
 from o2ims.adapter.orm import metadata, start_o2ims_mappers
-from o2ims.adapter.clients.orm_stx import start_o2ims_stx_mappers
-from o2ims.adapter import unit_of_work
-from o2ims.views.ocloud_route import configure_namespace
-from o2ims.bootstrap import bootstrap
+# from o2ims.adapter.clients.orm_stx import start_o2ims_stx_mappers
+
+from o2app.adapter import unit_of_work
+from o2ims.views import configure_namespace
+
+from o2app.bootstrap import bootstrap
 
 
 @pytest.fixture
@@ -33,12 +36,11 @@ def mock_uow():
 def mock_flask_uow(mock_uow):
     session, uow = mock_uow
     app = Flask(__name__)
-    # app.config["TESTING"] = True
+    app.config["TESTING"] = True
     api = Api(app)
-    bus = bootstrap(False, uow)
-    configure_namespace(api, bus)
-    client = app.test_client()
-    return session, client
+    bootstrap(False, uow)
+    configure_namespace(api)
+    return session, app
 
 
 @pytest.fixture
@@ -71,17 +73,17 @@ def sqlite_uow(sqlite_session_factory):
 @pytest.fixture
 def sqlite_flask_uow(sqlite_uow):
     app = Flask(__name__)
-    # app.config["TESTING"] = True
+    app.config["TESTING"] = True
     api = Api(app)
-    bus = bootstrap(False, sqlite_uow)
-    configure_namespace(api, bus)
-    yield app.test_client()
+    bootstrap(False, sqlite_uow)
+    configure_namespace(api)
+    yield sqlite_uow, app
 
 
 @pytest.fixture
 def mappers():
     start_o2ims_mappers()
-    start_o2ims_stx_mappers()
+    # start_o2ims_stx_mappers()
     yield
     clear_mappers()
 
@@ -131,10 +133,11 @@ def postgres_uow(postgres_session_factory):
 @pytest.fixture
 def postgres_flask_uow(postgres_uow):
     app = Flask(__name__)
+    app.config["TESTING"] = True
     api = Api(app)
-    bus = bootstrap(False, postgres_uow)
-    configure_namespace(api, bus)
-    yield app.test_client()
+    bootstrap(False, postgres_uow)
+    configure_namespace(api)
+    yield postgres_uow, app
 
 
 @pytest.fixture