aboutsummaryrefslogtreecommitdiffstats
path: root/moonv4
diff options
context:
space:
mode:
authorThomas Duval <thomas.duval@orange.com>2017-12-14 10:17:13 +0100
committerThomas Duval <thomas.duval@orange.com>2017-12-14 10:17:13 +0100
commit89cbd7d4b1b66afe25a0af13256f7b001f931dae (patch)
tree7eb27631a23d5bc4bca9bba0bfb6dbdfb1086e3d /moonv4
parentbf495b93579a71dd01460cfeaf750703b239892d (diff)
Fix a bug in configuration of unit tests.
Change-Id: Ie2e73142f99bd7fcf015590673b25cde7c685f80
Diffstat (limited to 'moonv4')
-rw-r--r--moonv4/moon_db/tests/unit_python/conftest.py4
-rw-r--r--moonv4/moon_manager/tests/unit_python/conftest.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/moonv4/moon_db/tests/unit_python/conftest.py b/moonv4/moon_db/tests/unit_python/conftest.py
index 6cce944e..b9f38d7c 100644
--- a/moonv4/moon_db/tests/unit_python/conftest.py
+++ b/moonv4/moon_db/tests/unit_python/conftest.py
@@ -192,9 +192,9 @@ def set_consul_and_db(monkeypatch):
"id": "1111111111111"
}]}
)
- from moon_db.db_manager import init_engine, run
+ from moon_db.db_manager import init_engine, main
engine = init_engine()
- run("upgrade", logging.getLogger("db_manager"), engine)
+ main("upgrade", logging.getLogger("db_manager"), engine)
yield m
os.unlink(CONF['database']['url'].replace("sqlite:///", ""))
diff --git a/moonv4/moon_manager/tests/unit_python/conftest.py b/moonv4/moon_manager/tests/unit_python/conftest.py
index 58f04af2..d6f518f7 100644
--- a/moonv4/moon_manager/tests/unit_python/conftest.py
+++ b/moonv4/moon_manager/tests/unit_python/conftest.py
@@ -176,10 +176,10 @@ def no_requests(monkeypatch):
}]}
)
print("Start populating the DB.")
- from moon_db.db_manager import init_engine, run
+ from moon_db.db_manager import init_engine, main
engine = init_engine()
print("engine={}".format(engine))
- run("upgrade", logging.getLogger("db_manager"), engine)
+ main("upgrade", logging.getLogger("db_manager"), engine)
print("End populating the DB.")
yield m