diff options
| author |   Ruan HE <ruan.he@orange.com> | 2017-12-14 12:06:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-14 12:06:42 +0000 |
| commit | 30d8c92f1ae7c27934622cce8f5f7b393cc39e52 (patch) | |
| tree | ee0df0c795bb6e505b32678de45e44232a874387 /moonv4 | |
| parent | 277da07492c1440af5098c25f26b94739ddb41a8 (diff) | |
| parent | 89cbd7d4b1b66afe25a0af13256f7b001f931dae (diff) | |
Merge "Fix a bug in configuration of unit tests."
Diffstat (limited to 'moonv4')
| -rw-r--r-- | moonv4/moon_db/tests/unit_python/conftest.py | 4 | ||||
| -rw-r--r-- | moonv4/moon_manager/tests/unit_python/conftest.py | 4 |
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 |