diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-10 21:44:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-10 21:44:28 +0000 |
| commit | 3a671cd7dee8f084d72f8fad9897e46225be7069 (patch) | |
| tree | 6f720255038bcba262a223981766f84dfebe9a3b | |
| parent | a492558c6f0f0b1aecb763219f380cd58d269103 (diff) | |
| parent | 69f6b86768ec2c3e8b6ccf4704bef13f6f8cc4f8 (diff) | |
| download | nova-3a671cd7dee8f084d72f8fad9897e46225be7069.tar.gz nova-3a671cd7dee8f084d72f8fad9897e46225be7069.tar.xz nova-3a671cd7dee8f084d72f8fad9897e46225be7069.zip | |
Merge "Add a criteria to sort a list of dict in api samples"
| -rw-r--r-- | nova/tests/integrated/test_api_samples.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index d51240871..0c1bfdd3f 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -137,7 +137,17 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): if not isinstance(result, list): raise NoMatch( _('Result: %(result)s is not a list.') % locals()) - for ex_obj, res_obj in zip(sorted(expected), sorted(result)): + # NOTE(maurosr): sort the list of dicts by their __tag__ element + # when using xml. This will avoid some fails in keypairs api sample + # which order in different way when using a private key itself or + # its regular expression, and after all doesn't interfere with + # other tests. + # Should we define a criteria when ordering json? Doesn't seems + # necessary so far. + for ex_obj, res_obj in zip(sorted(expected, key=lambda k: + k.get('__tag__', k)), + sorted(result, key=lambda k: + k.get('__tag__', k))): res = self._compare_result(subs, ex_obj, res_obj) matched_value = res or matched_value |