Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor code layout
[pti/o2.git]
/
tests
/
conftest.py
diff --git
a/tests/conftest.py
b/tests/conftest.py
index
a3359a9
..
60f3d2e
100644
(file)
--- 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
\r
from unittest.mock import MagicMock
\r
\r
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.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.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.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
\r
\r
@pytest.fixture
\r
@@
-81,7
+84,7
@@
def sqlite_flask_uow(sqlite_uow):
@pytest.fixture
\r
def mappers():
\r
start_o2ims_mappers()
\r
@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
yield
\r
clear_mappers()
\r
\r