diff options
| author |   yayogev <yaronyogev@gmail.com> | 2018-03-21 17:31:54 +0200 |
|---|---|---|
| committer | yayogev <yaronyogev@gmail.com> | 2018-03-21 17:47:01 +0200 |
| commit | 2e47d8704fa0fe56ced38ddb4fc94f111079bd82 (patch) | |
| tree | 83e03bef41619bdce913057a08eeaf4b9be6d601 /app/test/api | |
| parent | 648a394f7a318443dfd82f790f83a79616c26905 (diff) | |
Python 3.4 backwards compatibility (for 'verify' job)
cherry-picked from internal commit by ilia on 07/02/2018 19:49
Change-Id: I03caf42492785a9af5e8301ca202b00a7b4af787
Signed-off-by: yayogev <yaronyogev@gmail.com>
Diffstat (limited to 'app/test/api')
| -rw-r--r-- | app/test/api/responders_test/test_data/clique_types.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/test/api/responders_test/test_data/clique_types.py b/app/test/api/responders_test/test_data/clique_types.py index 0791bdf..4d55c8b 100644 --- a/app/test/api/responders_test/test_data/clique_types.py +++ b/app/test/api/responders_test/test_data/clique_types.py @@ -11,6 +11,7 @@ from test.api.responders_test.test_data import base from test.api.responders_test.test_data.base import WRONG_MECHANISM_DRIVER, \ CORRECT_MECHANISM_DRIVER, CORRECT_TYPE_DRIVER, WRONG_TYPE_DRIVER, \ CORRECT_DISTRIBUTION, CORRECT_DIST_VER +from utils.util import merge_dicts URL = "/clique_types" @@ -61,8 +62,7 @@ CLIQUE_TYPES_WITH_SPECIFIC_ID = [ ] CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION = [ - get_payload(update={'id': SAMPLE_IDS[0], - **TEST_CONFIGURATION}, + get_payload(update=merge_dicts(TEST_CONFIGURATION, {'id': SAMPLE_IDS[0]}), delete=['environment']) ] |