diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-11 02:29:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-11 02:29:28 +0000 |
| commit | b7b124f32745eb4063ded5f2a175d559fba04dc9 (patch) | |
| tree | b45c1b8c731ed363542a09e4595b7695cedb0153 /openstackclient | |
| parent | 71d805008b36d33730ec75353f4781b0f3dc7eb0 (diff) | |
| parent | de8ab5e8fd05c3942a8ec332c01f4c92213f52d4 (diff) | |
| download | python-openstackclient-b7b124f32745eb4063ded5f2a175d559fba04dc9.tar.gz | |
Merge "More aggregate functional race chasing"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/functional/compute/v2/test_aggregate.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/openstackclient/tests/functional/compute/v2/test_aggregate.py b/openstackclient/tests/functional/compute/v2/test_aggregate.py index 8a082e82..be318ae5 100644 --- a/openstackclient/tests/functional/compute/v2/test_aggregate.py +++ b/openstackclient/tests/functional/compute/v2/test_aggregate.py @@ -20,15 +20,14 @@ from openstackclient.tests.functional import base class AggregateTests(base.TestCase): """Functional tests for aggregate""" - @classmethod - def wait_for_status(cls, check_type, check_name, desired_status, + def wait_for_status(self, check_type, check_name, desired_status, wait=120, interval=5, failures=None): current_status = "notset" if failures is None: failures = ['error'] total_sleep = 0 while total_sleep < wait: - output = json.loads(cls.openstack( + output = json.loads(self.openstack( check_type + ' show -f json ' + check_name)) current_status = output['name'] if (current_status == desired_status): @@ -44,7 +43,7 @@ class AggregateTests(base.TestCase): .format(current_status, check_type, check_name, failures)) time.sleep(interval) total_sleep += interval - cls.assertOutput(desired_status, current_status) + self.assertOutput(desired_status, current_status) def test_aggregate_crud(self): """Test create, delete multiple""" @@ -106,7 +105,6 @@ class AggregateTests(base.TestCase): name1 ) self.assertOutput('', raw_output) - self.wait_for_status('aggregate', name3, name3) self.addCleanup( self.openstack, 'aggregate delete ' + name3, |