X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tests%2Fconftest.py;h=60f3d2e9cbb93f6ecb79ca77fcd12bccfca5bbdc;hb=84867b76a65efc4e9add52c86eae7e451c4a038d;hp=a3359a9ec943c28256295c55288f4785d653b0eb;hpb=de778bc19d9329d3c1c3c536bfd702423102277b;p=pti%2Fo2.git diff --git a/tests/conftest.py b/tests/conftest.py index a3359a9..60f3d2e 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.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.bootstrap import bootstrap + +from o2app.bootstrap import bootstrap @pytest.fixture @@ -81,7 +84,7 @@ def sqlite_flask_uow(sqlite_uow): @pytest.fixture def mappers(): start_o2ims_mappers() - start_o2ims_stx_mappers() + # start_o2ims_stx_mappers() yield clear_mappers()