diff --git a/ranger_tempest_plugin/tests/api/base.py b/ranger_tempest_plugin/tests/api/base.py index 6a3c141..a9b3256 100755 --- a/ranger_tempest_plugin/tests/api/base.py +++ b/ranger_tempest_plugin/tests/api/base.py @@ -46,13 +46,15 @@ class BaseOrmTest(test.BaseTestCase): regions = [x for x in regions_list['regions']] for region in regions: - if region['domainName'] != CONF.auth.admin_domain_name: - region['domainName'] = CONF.auth.admin_domain_name - cls.region_client.update_region(region['id'], - **region) + if region['id'] is CONF.identity.region or \ + region['id'] is CONF.ranger.alt_region: cls.addClassResourceCleanup(cls.region_client.update_region, region['id'], **region) + region['domainName'] = CONF.auth.admin_domain_name + cls.region_client.update_region(region['id'], + **region) + super(BaseOrmTest, cls).setup_clients() @classmethod diff --git a/ranger_tempest_plugin/tests/api/test_images.py b/ranger_tempest_plugin/tests/api/test_images.py index 5cb77c1..747d5f0 100644 --- a/ranger_tempest_plugin/tests/api/test_images.py +++ b/ranger_tempest_plugin/tests/api/test_images.py @@ -318,7 +318,7 @@ class TestTempestIms(ims_base.ImsBaseOrmTest): self.assertIn('id', body['image']) _, body = self.client.get_image(image['id']) self.assertEqual(body['image']['id'], image['id']) - self.assertEqual(body['image']['regions'][0]['status'], 'success') + self.assertEqual(body['image']['regions'][0]['status'], 'Success') self._update_region(CONF.identity.region) @SYNC('region')