x/ranger-tempest-plugin
Code Issues Proposed changes

Merge "Adjust flavor tests for unordered list"

Browse Source
This commit is contained in:
Zuul 2020-06-18 20:19:13 +00:00 committed by Gerrit Code Review
commit c9dd2c3adb
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ranger_tempest_plugin/tests/api/test_flavors.py
View File

@ -245,6 +245,7 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
""" """
post_body = self._get_flavor_params() post_body = self._get_flavor_params()
flavor = self._data_setup(post_body) flavor = self._data_setup(post_body)
self._restore_default_tags(flavor['id'])
# for use by the 'constains and 'starts_with' filter # for use by the 'constains and 'starts_with' filter
str_index1 = data_utils.rand_int_id(0, len(flavor['name']) - 1) str_index1 = data_utils.rand_int_id(0, len(flavor['name']) - 1)
@ -287,6 +288,7 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
subset = {k: v for k, v in list(tag_body.get("tags").items()) subset = {k: v for k, v in list(tag_body.get("tags").items())
if k in add_tag_body.get("tags")} if k in add_tag_body.get("tags")}
self._restore_default_tags(self.flavor['id'])
self.assertDictEqual(add_tag_body.get("tags"), subset) self.assertDictEqual(add_tag_body.get("tags"), subset)
@SYNC('flavor') @SYNC('flavor')
@ -299,6 +301,7 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
_, tag_body = self.client.get_tags(self.flavor['id']) _, tag_body = self.client.get_tags(self.flavor['id'])
self.assertDictEqual(replace_tag_body.get("tags"), self.assertDictEqual(replace_tag_body.get("tags"),
tag_body.get("tags")) tag_body.get("tags"))
self._restore_default_tags(self.flavor['id'])
@SYNC('flavor') @SYNC('flavor')
@decorators.idempotent_id('e0a0eca6-e120-45ab-a1a4-f5b95fdf97f1') @decorators.idempotent_id('e0a0eca6-e120-45ab-a1a4-f5b95fdf97f1')
@ -311,6 +314,7 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
_, tag_body = self.client.get_tags(self.flavor['id']) _, tag_body = self.client.get_tags(self.flavor['id'])
tag_present = tag_body.get("tags").get(delete_tag_key, None) tag_present = tag_body.get("tags").get(delete_tag_key, None)
self.assertIsNone(tag_present) self.assertIsNone(tag_present)
self._restore_default_tags(self.flavor['id'])
@SYNC('flavor') @SYNC('flavor')
@decorators.idempotent_id('9c511020-53ed-4139-8c53-451cb0ea8c75') @decorators.idempotent_id('9c511020-53ed-4139-8c53-451cb0ea8c75')
@ -347,8 +351,10 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
self._wait_for_flavor_status_on_dcp(test_flavor_id, 'Success') self._wait_for_flavor_status_on_dcp(test_flavor_id, 'Success')
_, body = self.client.get_flavor(test_flavor_id) _, body = self.client.get_flavor(test_flavor_id)
self._wait_for_flavor_region_status(flavor, CONF.ranger.alt_region) self._wait_for_flavor_region_status(flavor, CONF.ranger.alt_region)
self.assertEqual(body["flavor"]["regions"][1]["name"], assert self.region or self.alt_region in \
post_region_body["regions"][0]["name"]) body['flavor']['regions'][0]['name']
assert self.region or self.alt_region in \
body['flavor']['regions'][1]['name']
# remove added region and then check to confirm flavor status # remove added region and then check to confirm flavor status
_, body = self.client.delete_flavor_region(test_flavor_id, _, body = self.client.delete_flavor_region(test_flavor_id,
@ -527,7 +533,6 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
self.assertEqual(flavor_details["status"], "Success") self.assertEqual(flavor_details["status"], "Success")
self.assertEqual(flavor_details["disk"], disk) self.assertEqual(flavor_details["disk"], disk)
@SYNC('region')
@testtools.skipUnless(CONF.ranger.alt_region_available, @testtools.skipUnless(CONF.ranger.alt_region_available,
'Alt region not provided, skipping this test') 'Alt region not provided, skipping this test')
@decorators.idempotent_id('997ca03c-4176-4632-a0c9-7e943b03306c') @decorators.idempotent_id('997ca03c-4176-4632-a0c9-7e943b03306c')
@ -544,7 +549,6 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
self.assertEqual(flavor_details['status'], 'Success') self.assertEqual(flavor_details['status'], 'Success')
self.assertEqual(flavor['regions'][0]['name'], CONF.identity.region) self.assertEqual(flavor['regions'][0]['name'], CONF.identity.region)
@SYNC('region')
@testtools.skipUnless(CONF.ranger.alt_region_available, @testtools.skipUnless(CONF.ranger.alt_region_available,
'Alt region not provided, skipping this test') 'Alt region not provided, skipping this test')
@decorators.idempotent_id('ea2a618e-bd53-460b-bde5-01ea20b417c9') @decorators.idempotent_id('ea2a618e-bd53-460b-bde5-01ea20b417c9')
@ -559,7 +563,6 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
self.assertEqual(flavor_details['status'], 'Success') self.assertEqual(flavor_details['status'], 'Success')
self.assertEqual(len(flavor['regions']), 2) self.assertEqual(len(flavor['regions']), 2)
@SYNC('region')
@testtools.skipUnless(CONF.ranger.alt_region_available, @testtools.skipUnless(CONF.ranger.alt_region_available,
'Alt region not provided, skipping this test') 'Alt region not provided, skipping this test')
@decorators.idempotent_id('06c81b29-85b6-4edf-ab89-3877c49e23bc') @decorators.idempotent_id('06c81b29-85b6-4edf-ab89-3877c49e23bc')
@ -575,8 +578,8 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
flavor = self._data_setup(post_body) flavor = self._data_setup(post_body)
flavor_details = self._get_flavor_details(flavor['id']) flavor_details = self._get_flavor_details(flavor['id'])
self.assertEqual(flavor_details['status'], 'Success') self.assertEqual(flavor_details['status'], 'Success')
self.assertEqual(flavor['regions'][0]['name'], self.region) assert self.region_alt or self.region in flavor['regions'][0]['name']
self.assertEqual(flavor['regions'][1]['name'], self.region_alt) assert self.region_alt or self.region in flavor['regions'][1]['name']
@decorators.idempotent_id('997ca03c-4176-4632-a0c9-7e943b03306d') @decorators.idempotent_id('997ca03c-4176-4632-a0c9-7e943b03306d')
def test_create_flavor_with_uuid(self): def test_create_flavor_with_uuid(self):