From 9117193ee683e2c7360a7650372cec043d594498 Mon Sep 17 00:00:00 2001
From: jh629g <jh629g@att.com>
Date: Thu, 18 Jun 2020 11:14:38 -0500
Subject: [PATCH] Adjust flavor tests for unordered list
List of regions can change between environments,
changes assert statements to allow for this case
Change-Id: I8d44b72940c9a732b617703a116634ed39e6c386
---
ranger_tempest_plugin/tests/api/test_flavors.py | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/ranger_tempest_plugin/tests/api/test_flavors.py b/ranger_tempest_plugin/tests/api/test_flavors.py
index f2b55bf..2f644fe 100755
--- a/ranger_tempest_plugin/tests/api/test_flavors.py
+++ b/ranger_tempest_plugin/tests/api/test_flavors.py
@@ -245,6 +245,7 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
"""
post_body = self._get_flavor_params()
flavor = self._data_setup(post_body)
+ self._restore_default_tags(flavor['id'])
# for use by the 'constains and 'starts_with' filter
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())
if k in add_tag_body.get("tags")}
+ self._restore_default_tags(self.flavor['id'])
self.assertDictEqual(add_tag_body.get("tags"), subset)
@SYNC('flavor')
@@ -299,6 +301,7 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
_, tag_body = self.client.get_tags(self.flavor['id'])
self.assertDictEqual(replace_tag_body.get("tags"),
tag_body.get("tags"))
+ self._restore_default_tags(self.flavor['id'])
@SYNC('flavor')
@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_present = tag_body.get("tags").get(delete_tag_key, None)
self.assertIsNone(tag_present)
+ self._restore_default_tags(self.flavor['id'])
@SYNC('flavor')
@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')
_, body = self.client.get_flavor(test_flavor_id)
self._wait_for_flavor_region_status(flavor, CONF.ranger.alt_region)
- self.assertEqual(body["flavor"]["regions"][1]["name"],
- post_region_body["regions"][0]["name"])
+ assert self.region or self.alt_region in \
+ 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
_, 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["disk"], disk)
- @SYNC('region')
@testtools.skipUnless(CONF.ranger.alt_region_available,
'Alt region not provided, skipping this test')
@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['regions'][0]['name'], CONF.identity.region)
- @SYNC('region')
@testtools.skipUnless(CONF.ranger.alt_region_available,
'Alt region not provided, skipping this test')
@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(len(flavor['regions']), 2)
- @SYNC('region')
@testtools.skipUnless(CONF.ranger.alt_region_available,
'Alt region not provided, skipping this test')
@decorators.idempotent_id('06c81b29-85b6-4edf-ab89-3877c49e23bc')
@@ -575,8 +578,8 @@ class TestTempestFms(fms_base.FmsBaseOrmTest):
flavor = self._data_setup(post_body)
flavor_details = self._get_flavor_details(flavor['id'])
self.assertEqual(flavor_details['status'], 'Success')
- self.assertEqual(flavor['regions'][0]['name'], self.region)
- self.assertEqual(flavor['regions'][1]['name'], self.region_alt)
+ assert self.region_alt or self.region in flavor['regions'][0]['name']
+ assert self.region_alt or self.region in flavor['regions'][1]['name']
@decorators.idempotent_id('997ca03c-4176-4632-a0c9-7e943b03306d')
def test_create_flavor_with_uuid(self):