openstack/watcher
Code Issues Proposed changes

Switch to use test_utils.call_until_true

Browse Source 
test.call_until_true has been deprecated since Newton on Tempest side,
and now Tempest provides test_utils.call_until_true as the stable
library method. So this patch switches to use the stable method before
removing old test.call_until_true on Tempest side.

Change-Id: Iba2130aca93c8e6bccb4f8ed169424c791ebc127
Needed-by: Ide11a7434a4714e5d2211af1803333535f557370
This commit is contained in:
Ken'ichi Ohmichi 2017-02-09 10:49:40 -08:00
parent 8ceb710b59
commit a9b3534e97
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
watcher_tempest_plugin/tests/api/admin/base.py
View File

@ -17,6 +17,7 @@
import functools import functools
from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils
from tempest import test from tempest import test
from watcher_tempest_plugin import infra_optim_clients as clients from watcher_tempest_plugin import infra_optim_clients as clients
@ -59,7 +60,7 @@ class BaseInfraOptimTest(test.BaseTestCase):
action_plans_to_be_deleted = set() action_plans_to_be_deleted = set()
# Phase 1: Make sure all objects are in an idle state # Phase 1: Make sure all objects are in an idle state
for audit_uuid in cls.created_audits: for audit_uuid in cls.created_audits:
test.call_until_true( test_utils.call_until_true(
func=functools.partial( func=functools.partial(
cls.is_audit_idle, audit_uuid), cls.is_audit_idle, audit_uuid),
duration=30, duration=30,
@ -73,7 +74,7 @@ class BaseInfraOptimTest(test.BaseTestCase):
ap['uuid'] for ap in action_plans['action_plans']) ap['uuid'] for ap in action_plans['action_plans'])
for action_plan in action_plans['action_plans']: for action_plan in action_plans['action_plans']:
test.call_until_true( test_utils.call_until_true(
func=functools.partial( func=functools.partial(
cls.is_action_plan_idle, action_plan['uuid']), cls.is_action_plan_idle, action_plan['uuid']),
duration=30, duration=30,
@ -213,7 +214,7 @@ class BaseInfraOptimTest(test.BaseTestCase):
_, audit = cls.create_audit(audit_template_uuid, **audit_kwargs) _, audit = cls.create_audit(audit_template_uuid, **audit_kwargs)
audit_uuid = audit['uuid'] audit_uuid = audit['uuid']
assert test.call_until_true( assert test_utils.call_until_true(
func=functools.partial(cls.has_audit_finished, audit_uuid), func=functools.partial(cls.has_audit_finished, audit_uuid),
duration=30, duration=30,
sleep_for=.5 sleep_for=.5

3
watcher_tempest_plugin/tests/api/admin/test_action.py
View File

@ -19,6 +19,7 @@ from __future__ import unicode_literals
import collections import collections
import functools import functools
from tempest.lib.common.utils import test_utils
from tempest import test from tempest import test
from watcher_tempest_plugin.tests.api.admin import base from watcher_tempest_plugin.tests.api.admin import base
@ -34,7 +35,7 @@ class TestShowListAction(base.BaseInfraOptimTest):
_, cls.audit_template = cls.create_audit_template(cls.goal['uuid']) _, cls.audit_template = cls.create_audit_template(cls.goal['uuid'])
_, cls.audit = cls.create_audit(cls.audit_template['uuid']) _, cls.audit = cls.create_audit(cls.audit_template['uuid'])
assert test.call_until_true( assert test_utils.call_until_true(
func=functools.partial(cls.has_audit_finished, cls.audit['uuid']), func=functools.partial(cls.has_audit_finished, cls.audit['uuid']),
duration=30, duration=30,
sleep_for=.5 sleep_for=.5

11
watcher_tempest_plugin/tests/api/admin/test_action_plan.py
View File

@ -18,6 +18,7 @@ from __future__ import unicode_literals
import functools import functools
from tempest.lib.common.utils import test_utils
from tempest.lib import exceptions from tempest.lib import exceptions
from tempest import test from tempest import test
@ -33,7 +34,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
_, audit_template = self.create_audit_template(goal['uuid']) _, audit_template = self.create_audit_template(goal['uuid'])
_, audit = self.create_audit(audit_template['uuid']) _, audit = self.create_audit(audit_template['uuid'])
self.assertTrue(test.call_until_true( self.assertTrue(test_utils.call_until_true(
func=functools.partial(self.has_audit_finished, audit['uuid']), func=functools.partial(self.has_audit_finished, audit['uuid']),
duration=30, duration=30,
sleep_for=.5 sleep_for=.5
@ -53,7 +54,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
_, audit_template = self.create_audit_template(goal['uuid']) _, audit_template = self.create_audit_template(goal['uuid'])
_, audit = self.create_audit(audit_template['uuid']) _, audit = self.create_audit(audit_template['uuid'])
self.assertTrue(test.call_until_true( self.assertTrue(test_utils.call_until_true(
func=functools.partial(self.has_audit_finished, audit['uuid']), func=functools.partial(self.has_audit_finished, audit['uuid']),
duration=30, duration=30,
sleep_for=.5 sleep_for=.5
@ -75,7 +76,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
_, audit_template = self.create_audit_template(goal['uuid']) _, audit_template = self.create_audit_template(goal['uuid'])
_, audit = self.create_audit(audit_template['uuid']) _, audit = self.create_audit(audit_template['uuid'])
self.assertTrue(test.call_until_true( self.assertTrue(test_utils.call_until_true(
func=functools.partial(self.has_audit_finished, audit['uuid']), func=functools.partial(self.has_audit_finished, audit['uuid']),
duration=30, duration=30,
sleep_for=.5 sleep_for=.5
@ -94,7 +95,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
# Execute the action by changing its state to PENDING # Execute the action by changing its state to PENDING
_, updated_ap = self.client.start_action_plan(action_plan['uuid']) _, updated_ap = self.client.start_action_plan(action_plan['uuid'])
self.assertTrue(test.call_until_true( self.assertTrue(test_utils.call_until_true(
func=functools.partial( func=functools.partial(
self.has_action_plan_finished, action_plan['uuid']), self.has_action_plan_finished, action_plan['uuid']),
duration=30, duration=30,
@ -116,7 +117,7 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
_, cls.audit_template = cls.create_audit_template(cls.goal['uuid']) _, cls.audit_template = cls.create_audit_template(cls.goal['uuid'])
_, cls.audit = cls.create_audit(cls.audit_template['uuid']) _, cls.audit = cls.create_audit(cls.audit_template['uuid'])
assert test.call_until_true( assert test_utils.call_until_true(
func=functools.partial(cls.has_audit_finished, cls.audit['uuid']), func=functools.partial(cls.has_audit_finished, cls.audit['uuid']),
duration=30, duration=30,
sleep_for=.5 sleep_for=.5

5
watcher_tempest_plugin/tests/api/admin/test_audit.py
View File

@ -18,6 +18,7 @@ from __future__ import unicode_literals
import functools import functools
from tempest.lib.common.utils import test_utils
from tempest.lib import exceptions from tempest.lib import exceptions
from tempest import test from tempest import test
@ -125,7 +126,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
_, body = self.create_audit(audit_template['uuid']) _, body = self.create_audit(audit_template['uuid'])
audit_uuid = body['uuid'] audit_uuid = body['uuid']
test.call_until_true( test_utils.call_until_true(
func=functools.partial( func=functools.partial(
self.is_audit_idle, audit_uuid), self.is_audit_idle, audit_uuid),
duration=10, duration=10,
@ -140,7 +141,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
self.delete_audit(audit_uuid) self.delete_audit(audit_uuid)
test.call_until_true( test_utils.call_until_true(
func=functools.partial(is_audit_deleted, audit_uuid), func=functools.partial(is_audit_deleted, audit_uuid),
duration=5, duration=5,
sleep_for=1 sleep_for=1

8
watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py
View File

@ -20,7 +20,7 @@ from __future__ import unicode_literals
import functools import functools
from tempest import config from tempest import config
from tempest import test from tempest.lib.common.utils import test_utils
from watcher_tempest_plugin.tests.scenario import base from watcher_tempest_plugin.tests.scenario import base
@ -84,7 +84,7 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
except Exception: except Exception:
return False return False
assert test.call_until_true( assert test_utils.call_until_true(
func=_are_compute_nodes_setup, func=_are_compute_nodes_setup,
duration=600, duration=600,
sleep_for=2 sleep_for=2
@ -146,7 +146,7 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
_, audit = self.create_audit(audit_template['uuid']) _, audit = self.create_audit(audit_template['uuid'])
try: try:
self.assertTrue(test.call_until_true( self.assertTrue(test_utils.call_until_true(
func=functools.partial( func=functools.partial(
self.has_audit_finished, audit['uuid']), self.has_audit_finished, audit['uuid']),
duration=600, duration=600,
@ -174,7 +174,7 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
# Execute the action by changing its state to PENDING # Execute the action by changing its state to PENDING
_, updated_ap = self.client.start_action_plan(action_plan['uuid']) _, updated_ap = self.client.start_action_plan(action_plan['uuid'])
self.assertTrue(test.call_until_true( self.assertTrue(test_utils.call_until_true(
func=functools.partial( func=functools.partial(
self.has_action_plan_finished, action_plan['uuid']), self.has_action_plan_finished, action_plan['uuid']),
duration=600, duration=600,

6
watcher_tempest_plugin/tests/scenario/test_execute_dummy_optim.py
View File

@ -20,7 +20,7 @@ from __future__ import unicode_literals
import collections import collections
import functools import functools
from tempest import test from tempest.lib.common.utils import test_utils
from watcher_tempest_plugin.tests.scenario import base from watcher_tempest_plugin.tests.scenario import base
@ -41,7 +41,7 @@ class TestExecuteDummyStrategy(base.BaseInfraOptimScenarioTest):
_, audit_template = self.create_audit_template(goal['uuid']) _, audit_template = self.create_audit_template(goal['uuid'])
_, audit = self.create_audit(audit_template['uuid']) _, audit = self.create_audit(audit_template['uuid'])
self.assertTrue(test.call_until_true( self.assertTrue(test_utils.call_until_true(
func=functools.partial(self.has_audit_finished, audit['uuid']), func=functools.partial(self.has_audit_finished, audit['uuid']),
duration=30, duration=30,
sleep_for=.5 sleep_for=.5
@ -63,7 +63,7 @@ class TestExecuteDummyStrategy(base.BaseInfraOptimScenarioTest):
# Execute the action by changing its state to PENDING # Execute the action by changing its state to PENDING
_, updated_ap = self.client.start_action_plan(action_plan['uuid']) _, updated_ap = self.client.start_action_plan(action_plan['uuid'])
self.assertTrue(test.call_until_true( self.assertTrue(test_utils.call_until_true(
func=functools.partial( func=functools.partial(
self.has_action_plan_finished, action_plan['uuid']), self.has_action_plan_finished, action_plan['uuid']),
duration=30, duration=30,