X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tests%2Fconftest.py;h=a1655b461bc664810df51e4f35e46514fb56db43;hb=6c304dfab28ffd1bbe69b9ada3d11e8fbbde014b;hp=60f3d2e9cbb93f6ecb79ca77fcd12bccfca5bbdc;hpb=84867b76a65efc4e9add52c86eae7e451c4a038d;p=pti%2Fo2.git diff --git a/tests/conftest.py b/tests/conftest.py index 60f3d2e..a1655b4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -20,7 +20,7 @@ from o2ims.adapter.orm import metadata, start_o2ims_mappers # from o2ims.adapter.clients.orm_stx import start_o2ims_stx_mappers from o2app.adapter import unit_of_work -from o2ims.views.ocloud_route import configure_namespace +from o2ims.views import configure_namespace from o2app.bootstrap import bootstrap @@ -36,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 @@ -74,11 +73,11 @@ 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 @@ -134,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