openstack
/
designate-tempest-plugin
Code Issues Proposed changes

Fix blacklist scenario test conflicts 

A recent patch[1] reverted a fix for broad blacklists in scenario tests interferring with other test suites. This patch puts that fix[2] back in to stop cross-test suite failures due to blacklist collisions.

[1] https://review.opendev.org/c/openstack/designate-tempest-plugin/+/853873
[2] https://review.opendev.org/c/openstack/designate-tempest-plugin/+/816910

Change-Id: I9e90196e2df945855ef7d6a74afac13834a1339a
This commit is contained in:
Michael Johnson 2022-10-12 21:48:32 +00:00
parent 6c251b44c5
commit e52be15f30
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
designate_tempest_plugin/tests/scenario/v2/test_blacklists.py
View File

@ -112,8 +112,8 @@ class BlacklistE2E(BaseBlacklistsTest):
zone_name_to_deny = dns_data_utils.rand_zone_name( zone_name_to_deny = dns_data_utils.rand_zone_name(
name="deny_by_name", suffix=self.tld_name) name="deny_by_name", suffix=self.tld_name)
blacklists = [ blacklists = [
{'pattern': '^a.*', {'pattern': '^blacklistnameregextest2.*',
'description': 'Zone starts with "a" char'}, 'description': 'Zone starts with "blacklistnameregextest2"'},
{'pattern': zone_name_to_deny, {'pattern': zone_name_to_deny,
'description': 'Deny if Zone named:{} '.format( 'description': 'Deny if Zone named:{} '.format(
zone_name_to_deny)}] zone_name_to_deny)}]
@ -141,12 +141,12 @@ class BlacklistE2E(BaseBlacklistsTest):
with self.assertRaisesDns( with self.assertRaisesDns(
lib_exc.BadRequest, 'invalid_zone_name', 400): lib_exc.BadRequest, 'invalid_zone_name', 400):
self.primary_zone_client.create_zone( self.primary_zone_client.create_zone(
name='a{}'.format(zone_name_to_deny)) name='blacklistnameregextest2{}'.format(zone_name_to_deny))
LOG.info('Admin tries to create a zone that is blacklisted by regex' LOG.info('Admin tries to create a zone that is blacklisted by regex'
' for a Primary user. Expected: FAIL') ' for a Primary user. Expected: FAIL')
zone = self.admin_zone_client.create_zone( zone = self.admin_zone_client.create_zone(
name='a{}'.format(zone_name_to_deny), name='blacklistnameregextest2{}'.format(zone_name_to_deny),
project_id=self.primary_zone_client.project_id)[1] project_id=self.primary_zone_client.project_id)[1]
self.addCleanup( self.addCleanup(
self.wait_zone_delete, self.primary_zone_client, zone['id']) self.wait_zone_delete, self.primary_zone_client, zone['id'])