From 2e47d8704fa0fe56ced38ddb4fc94f111079bd82 Mon Sep 17 00:00:00 2001 From: yayogev Date: Wed, 21 Mar 2018 17:31:54 +0200 Subject: 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 --- app/test/api/responders_test/test_data/clique_types.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/test') 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']) ] -- cgit 1.2.3-korg