openstack
/
trove
Code Issues Proposed changes

Merge "Fix get_flavors test by sorting json output"

This commit is contained in:
Jenkins 2015-09-16 12:29:21 +00:00 committed by Gerrit Code Review
parent aa389979d8 7a9e02a1fa
commit 17ac1d0a17
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
trove/tests/examples/client.py
View File

@ -193,15 +193,26 @@ class SnippetWriter(object):
fail('Error: output files differ for %s:\n%s'
% (filename, diff))
def order_json(json_obj):
"""Sort the json object so that it can be compared properly."""
if isinstance(json_obj, list):
return sorted(order_json(elem) for elem in json_obj)
if isinstance(json_obj, dict):
return sorted(
(key, order_json(value))
for key, value in json_obj.items())
else:
return json_obj
def assert_json_matches(original):
try:
expected = json.loads(original)
actual = json.loads(output)
expected_json = json.loads(original)
actual_json = json.loads(output)
except ValueError:
fail('Invalid json!\nExpected: %s\nActual: %s'
% (original, output))
if expected != actual:
if order_json(expected_json) != order_json(actual_json):
# Re-Use the same failure output if the json is different
assert_file_matches(original)