From 0983f9169f3e90629ee845926d56ac674d4b1a34 Mon Sep 17 00:00:00 2001 From: "francois.cellier" Date: Wed, 7 Mar 2018 12:52:25 +0100 Subject: Replace partner_id field by extra field. Do some refactoring to remove code duplication on sql.py Change-Id: I67576e20247e1f2fd71e18b92b9e4b6e8c86e44b --- moon_wrapper/tests/unit_python/conftest.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'moon_wrapper/tests/unit_python/conftest.py') diff --git a/moon_wrapper/tests/unit_python/conftest.py b/moon_wrapper/tests/unit_python/conftest.py index 621c2014..2c332c89 100644 --- a/moon_wrapper/tests/unit_python/conftest.py +++ b/moon_wrapper/tests/unit_python/conftest.py @@ -415,7 +415,7 @@ def set_consul_and_db(monkeypatch): "name": "testuser", "email": "mail", "id": "89ba91c18dd54abfbfde7a66936c51a6", - "partner_id": "" + "extra": {} }, "31fd15ad14784a9696fcc887dddbfaf9": { "description": "test", @@ -426,7 +426,7 @@ def set_consul_and_db(monkeypatch): "name": "adminuser", "email": "mail", "id": "31fd15ad14784a9696fcc887dddbfaf9", - "partner_id": "" + "extra": {} } } } @@ -439,7 +439,7 @@ def set_consul_and_db(monkeypatch): "name": "vm1", "description": "test", "id": "67b8008a3f8d4f8e847eb628f0f7ca0e", - "partner_id": "", + "extra": {}, "policy_list": [ "f8f49a779ceb47b3ac810f01ef71b4e0", "636cd473324f4c0bbd9102cb5b62a16d" @@ -449,7 +449,7 @@ def set_consul_and_db(monkeypatch): "name": "vm0", "description": "test", "id": "9089b3d2ce5b4e929ffc7e35b55eba1a", - "partner_id": "", + "extra": {}, "policy_list": [ "f8f49a779ceb47b3ac810f01ef71b4e0", "636cd473324f4c0bbd9102cb5b62a16d" @@ -466,7 +466,7 @@ def set_consul_and_db(monkeypatch): "name": "boot", "description": "test", "id": "cdb3df220dc04a6ea3334b994827b068", - "partner_id": "", + "extra": {}, "policy_list": [ "f8f49a779ceb47b3ac810f01ef71b4e0", "636cd473324f4c0bbd9102cb5b62a16d" @@ -476,7 +476,7 @@ def set_consul_and_db(monkeypatch): "name": "stop", "description": "test", "id": "cdb3df220dc04a6ea3334b994827b068", - "partner_id": "", + "extra": {}, "policy_list": [ "f8f49a779ceb47b3ac810f01ef71b4e0", "636cd473324f4c0bbd9102cb5b62a16d" @@ -486,7 +486,7 @@ def set_consul_and_db(monkeypatch): "name": "start", "description": "test", "id": "9f5112afe9b34a6c894eb87246ccb7aa", - "partner_id": "", + "extra": {}, "policy_list": [ "f8f49a779ceb47b3ac810f01ef71b4e0", "636cd473324f4c0bbd9102cb5b62a16d" -- cgit 1.2.3-korg