arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #579 from openstack-charmers/lourot/policyd

Browse Source 
Re-enable test_003_test_override_is_observed
This commit is contained in:
Frode Nordahl
2021-05-28 09:53:26 +02:00
committed by GitHub
parent ced4da0b96 8558473394
commit a07f379ea2
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zaza/openstack/charm_tests/policyd/tests.py
View File

@@ -401,9 +401,10 @@ class BasePolicydSpecialization(PolicydTest,
def test_003_test_override_is_observed(self):
"""Test that the override is observed by the underlying service."""
if (openstack_utils.get_os_release() <
openstack_utils.get_os_release('groovy_victoria')):
openstack_utils.get_os_release('xenial_queens')):
raise unittest.SkipTest(
"Test skipped until Bug #1880959 is fix released")
"Test skipped because bug #1880959 won't be fixed for "
"releases older than Queens")
if self._test_name is None:
logging.info("Doing policyd override for {}"
.format(self._service_name))
@@ -571,6 +572,13 @@ class GlanceTests(BasePolicydSpecialization):
super(GlanceTests, cls).setUpClass(application_name="glance")
cls.application_name = "glance"
# NOTE(lourot): Same as NeutronApiTests. There is a race between the glance
# charm signalling its readiness and the service actually being ready to
# serve requests. The test will fail intermittently unless we gracefully
# accept this.
# Issue: openstack-charmers/zaza-openstack-tests#578
@tenacity.retry(wait=tenacity.wait_fixed(1),
reraise=True, stop=tenacity.stop_after_delay(8))
def get_client_and_attempt_operation(self, ip):
"""Attempt to list the images as a policyd override.