From a4eb88a69c8fc93ce4ffa2a0eaf25114e1d1a480 Mon Sep 17 00:00:00 2001 From: jh629g Date: Fri, 29 May 2020 15:42:45 -0500 Subject: [PATCH] Added skipchecks, updated region domain update setup Skipcheck implemented for when a test uses multiple ranger regions to execute a test and tempest did not provide an additional region to complete these tests with. Updated region domain update statement in setup steps to ensure that ranger-tempest-plugin does not attempt to update a secondary site when it is not available Change-Id: Ia19ef442107d7cc66d1f254860606245bf6c127f --- flake8rc | 2 +- ranger_tempest_plugin/tests/api/base.py | 3 ++- ranger_tempest_plugin/tests/api/test_flavors.py | 17 ++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake8rc b/flake8rc index 7157d0e..1364684 100644 --- a/flake8rc +++ b/flake8rc @@ -1,5 +1,5 @@ [flake8] -ignore = E125,E123,E129,H903 +ignore = E125,E123,E129,H903,H306 show-source = False exclude = .git, diff --git a/ranger_tempest_plugin/tests/api/base.py b/ranger_tempest_plugin/tests/api/base.py index a9b3256..e94dd11 100755 --- a/ranger_tempest_plugin/tests/api/base.py +++ b/ranger_tempest_plugin/tests/api/base.py @@ -47,7 +47,8 @@ class BaseOrmTest(test.BaseTestCase): for region in regions: if region['id'] is CONF.identity.region or \ - region['id'] is CONF.ranger.alt_region: + (region['id'] is CONF.ranger.alt_region and + CONF.ranger.alt_region_available is True): cls.addClassResourceCleanup(cls.region_client.update_region, region['id'], **region) diff --git a/ranger_tempest_plugin/tests/api/test_flavors.py b/ranger_tempest_plugin/tests/api/test_flavors.py index 828167b..e5d3eb1 100755 --- a/ranger_tempest_plugin/tests/api/test_flavors.py +++ b/ranger_tempest_plugin/tests/api/test_flavors.py @@ -20,14 +20,13 @@ from oslo_concurrency import lockutils from ranger_tempest_plugin import data_utils as orm_data_utils from ranger_tempest_plugin.tests.api import fms_base from tempest import config - from tempest.lib import decorators from tempest.lib import exceptions - from tempest.lib.common.utils import data_utils +import testtools + CONF = config.CONF - PREFIX = 'ranger' SYNC = lockutils.synchronized_with_prefix(PREFIX) @@ -500,6 +499,8 @@ class TestTempestFms(fms_base.FmsBaseOrmTest): 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') def test_create_flavor_with_region_group(self): # create region group @@ -515,11 +516,10 @@ class TestTempestFms(fms_base.FmsBaseOrmTest): 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') def test_create_flavor_with_two_regions(self): - if not self.region_alt: - raise exceptions.InvalidConfiguration( - 'Provide region_alt in ranger block in configuration file') post_body = self._get_flavor_params() post_body['regions'].append( {'name': self.region_alt} @@ -531,11 +531,10 @@ class TestTempestFms(fms_base.FmsBaseOrmTest): 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') def test_create_flavor_with_group_region(self): - if not self.region_alt: - raise exceptions.InvalidConfiguration( - 'Provide region_alt in ranger block in configuration file') group_id = self._create_region_group() post_body = self._get_flavor_params() post_body['regions'] = [