From bdf5048343f9d3f419bbd16dfb219fa79a9ad694 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 21 May 2017 10:13:45 +0200 Subject: Sort keys when dumping json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise dumping them could break some unit tests as they are unordered collections [1]. [1] https://build.opnfv.org/ci/job/functest-verify-master/4122/ Change-Id: I108e946926ae9690cf2421e565f2bb81500f9160 Signed-off-by: Cédric Ollivier --- functest/tests/unit/utils/test_decorators.py | 2 +- functest/utils/functest_utils.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/functest/tests/unit/utils/test_decorators.py b/functest/tests/unit/utils/test_decorators.py index 6bd47d25..44448f23 100644 --- a/functest/tests/unit/utils/test_decorators.py +++ b/functest/tests/unit/utils/test_decorators.py @@ -63,7 +63,7 @@ class DecoratorsTesting(unittest.TestCase): 'pod_name': self._node_name, 'installer': self._installer_type, 'scenario': self._deploy_scenario, 'version': VERSION, 'details': {}, 'criteria': self._result} - return json.dumps(data) + return json.dumps(data, sort_keys=True) @mock.patch('{}.get_db_url'.format(functest_utils.__name__), return_value='http://127.0.0.1') diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index 284c7971..dc20eea1 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -221,7 +221,8 @@ def push_results_to_db(project, case_name, error = None headers = {'Content-Type': 'application/json'} try: - r = requests.post(url, data=json.dumps(params), headers=headers) + r = requests.post(url, data=json.dumps(params, sort_keys=True), + headers=headers) logger.debug(r) r.raise_for_status() except requests.RequestException as exc: -- cgit 1.2.3-korg