openstack/nova
Code Issues Proposed changes

Fixed random failing of test_describe_instances_with_filters_tags

Browse Source 
In some cases (when PYTHONHASHSEED=2772952699)
test test_describe_instances_with_filters_tags fails.

This happens because order of dictionaries in list
depends on PYTHONHASHSEED. We can't sort these dictionaries
by method sort() because dictionaries are uncomparable
in Python 3.4.

Added method _normalize_reservation_set to the test.
This method sorts elements order of which could change.

Closes-Bug: #1479780

Co-Authored-By: Timofey Durakov <tdurakov@mirantis.com>
Co-Authored-By: Pavel Kholkin <pkholkin@mirantis.com>

Change-Id: I3af94fa8f96e239dfc64537895d06a09eae380b5
This commit is contained in:
Sergey Nikitin
2015-08-04 16:15:11 +03:00
parent 57967ae351
commit 3318032224
1 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
nova/tests/unit/api/ec2/test_cloud.py
View File

@@ -1139,38 +1139,61 @@ class CloudTestCase(test.TestCase):
'ownerId': None, 'ownerId': None,
'reservationId': u'b'} 'reservationId': u'b'}
def _normalize_reservation_set(reservation_set):
"""Sort elements in reservation_set by instanceId, sort tags in
instance set, method is required because order of elements
could be changed by random PYTHONHASHSEED
:param reservation_set: reservation set to normalize
"""
reservation_set['reservationSet'] = sorted(
reservation_set['reservationSet'],
key=lambda x: x['instancesSet'][0]['instanceId'])
for instance_ret in reservation_set['reservationSet']:
for instance_set in instance_ret['instancesSet']:
instance_set['tagSet'] = sorted(
instance_set['tagSet'],
key=lambda x: (x['key'], x['value']))
def _compare_reservation_set(expected, actual):
_normalize_reservation_set(expected)
_normalize_reservation_set(actual)
self.assertEqual(expected, actual)
# No filter # No filter
result = self.cloud.describe_instances(self.context) result = self.cloud.describe_instances(self.context)
self.assertJsonEqual(result, {'reservationSet': _compare_reservation_set({'reservationSet': [inst1_ret, inst2_ret]},
[inst1_ret, inst2_ret]}) result)
# Key search # Key search
# Both should have tags with key 'foo' and value 'bar' # Both should have tags with key 'foo' and value 'bar'
filters = {'filter': [{'name': 'tag:foo', filters = {'filter': [{'name': 'tag:foo',
'value': ['bar']}]} 'value': ['bar']}]}
result = self.cloud.describe_instances(self.context, **filters) result = self.cloud.describe_instances(self.context, **filters)
self.assertJsonEqual(result, {'reservationSet': _compare_reservation_set({'reservationSet': [inst1_ret, inst2_ret]},
[inst1_ret, inst2_ret]}) result)
# Both should have tags with key 'foo' # Both should have tags with key 'foo'
filters = {'filter': [{'name': 'tag-key', filters = {'filter': [{'name': 'tag-key',
'value': ['foo']}]} 'value': ['foo']}]}
result = self.cloud.describe_instances(self.context, **filters) result = self.cloud.describe_instances(self.context, **filters)
self.assertJsonEqual(result, {'reservationSet': _compare_reservation_set({'reservationSet': [inst1_ret, inst2_ret]},
[inst1_ret, inst2_ret]}) result)
# Value search # Value search
# Only inst2 should have tags with key 'baz' and value 'quux' # Only inst2 should have tags with key 'baz' and value 'quux'
filters = {'filter': [{'name': 'tag:baz', filters = {'filter': [{'name': 'tag:baz',
'value': ['quux']}]} 'value': ['quux']}]}
result = self.cloud.describe_instances(self.context, **filters) result = self.cloud.describe_instances(self.context, **filters)
self.assertJsonEqual(result, {'reservationSet': [inst2_ret]}) _compare_reservation_set({'reservationSet': [inst2_ret]}, result)
# Only inst2 should have tags with value 'quux' # Only inst2 should have tags with value 'quux'
filters = {'filter': [{'name': 'tag-value', filters = {'filter': [{'name': 'tag-value',
'value': ['quux']}]} 'value': ['quux']}]}
result = self.cloud.describe_instances(self.context, **filters) result = self.cloud.describe_instances(self.context, **filters)
self.assertJsonEqual(result, {'reservationSet': [inst2_ret]}) _compare_reservation_set({'reservationSet': [inst2_ret]}, result)
# Multiple values # Multiple values
# Both should have tags with key 'baz' and values in the set # Both should have tags with key 'baz' and values in the set
@@ -1178,8 +1201,8 @@ class CloudTestCase(test.TestCase):
filters = {'filter': [{'name': 'tag:baz', filters = {'filter': [{'name': 'tag:baz',
'value': ['quux', 'wibble']}]} 'value': ['quux', 'wibble']}]}
result = self.cloud.describe_instances(self.context, **filters) result = self.cloud.describe_instances(self.context, **filters)
self.assertJsonEqual(result, {'reservationSet': _compare_reservation_set({'reservationSet': [inst1_ret, inst2_ret]},
[inst1_ret, inst2_ret]}) result)
# Both should have tags with key 'baz' or tags with value 'bar' # Both should have tags with key 'baz' or tags with value 'bar'
filters = {'filter': [{'name': 'tag-key', filters = {'filter': [{'name': 'tag-key',
@@ -1187,8 +1210,8 @@ class CloudTestCase(test.TestCase):
{'name': 'tag-value', {'name': 'tag-value',
'value': ['bar']}]} 'value': ['bar']}]}
result = self.cloud.describe_instances(self.context, **filters) result = self.cloud.describe_instances(self.context, **filters)
self.assertJsonEqual(result, {'reservationSet': _compare_reservation_set({'reservationSet': [inst1_ret, inst2_ret]},
[inst1_ret, inst2_ret]}) result)
# Confirm deletion of tags # Confirm deletion of tags
# Check for format 'tag:' # Check for format 'tag:'
@@ -1196,17 +1219,17 @@ class CloudTestCase(test.TestCase):
filters = {'filter': [{'name': 'tag:foo', filters = {'filter': [{'name': 'tag:foo',
'value': ['bar']}]} 'value': ['bar']}]}
result = self.cloud.describe_instances(self.context, **filters) result = self.cloud.describe_instances(self.context, **filters)
self.assertJsonEqual(result, {'reservationSet': [inst2_ret]}) _compare_reservation_set({'reservationSet': [inst2_ret]}, result)
# Check for format 'tag-' # Check for format 'tag-'
filters = {'filter': [{'name': 'tag-key', filters = {'filter': [{'name': 'tag-key',
'value': ['foo']}]} 'value': ['foo']}]}
result = self.cloud.describe_instances(self.context, **filters) result = self.cloud.describe_instances(self.context, **filters)
self.assertJsonEqual(result, {'reservationSet': [inst2_ret]}) _compare_reservation_set({'reservationSet': [inst2_ret]}, result)
filters = {'filter': [{'name': 'tag-value', filters = {'filter': [{'name': 'tag-value',
'value': ['bar']}]} 'value': ['bar']}]}
result = self.cloud.describe_instances(self.context, **filters) result = self.cloud.describe_instances(self.context, **filters)
self.assertJsonEqual(result, {'reservationSet': [inst2_ret]}) _compare_reservation_set({'reservationSet': [inst2_ret]}, result)
# destroy the test instances # destroy the test instances
db.instance_destroy(self.context, inst1['uuid']) db.instance_destroy(self.context, inst1['uuid'])