openstack/watcher
Code Issues Proposed changes

Merge "Fix failing Tempest tests"

Browse Source
This commit is contained in:
Jenkins 2016-07-07 06:58:13 +00:00 committed by Gerrit Code Review
commit d61c4c12d1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
watcher_tempest_plugin/tests/api/admin/test_audit_template.py
View File

@ -29,7 +29,7 @@ class TestCreateDeleteAuditTemplate(base.BaseInfraOptimTest):
@test.attr(type='smoke') @test.attr(type='smoke')
def test_create_audit_template(self): def test_create_audit_template(self):
goal_name = "DUMMY" goal_name = "dummy"
_, goal = self.client.show_goal(goal_name) _, goal = self.client.show_goal(goal_name)
params = { params = {
@ -58,7 +58,7 @@ class TestCreateDeleteAuditTemplate(base.BaseInfraOptimTest):
@test.attr(type='smoke') @test.attr(type='smoke')
def test_create_audit_template_unicode_description(self): def test_create_audit_template_unicode_description(self):
goal_name = "DUMMY" goal_name = "dummy"
_, goal = self.client.show_goal(goal_name) _, goal = self.client.show_goal(goal_name)
# Use a unicode string for testing: # Use a unicode string for testing:
params = { params = {
@ -86,7 +86,7 @@ class TestCreateDeleteAuditTemplate(base.BaseInfraOptimTest):
@test.attr(type='smoke') @test.attr(type='smoke')
def test_delete_audit_template(self): def test_delete_audit_template(self):
_, goal = self.client.show_goal("DUMMY") _, goal = self.client.show_goal("dummy")
_, body = self.create_audit_template(goal=goal['uuid']) _, body = self.create_audit_template(goal=goal['uuid'])
audit_uuid = body['uuid'] audit_uuid = body['uuid']
@ -102,7 +102,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
@classmethod @classmethod
def resource_setup(cls): def resource_setup(cls):
super(TestAuditTemplate, cls).resource_setup() super(TestAuditTemplate, cls).resource_setup()
_, cls.goal = cls.client.show_goal("DUMMY") _, cls.goal = cls.client.show_goal("dummy")
_, cls.strategy = cls.client.show_strategy("dummy") _, cls.strategy = cls.client.show_strategy("dummy")
_, cls.audit_template = cls.create_audit_template( _, cls.audit_template = cls.create_audit_template(
goal=cls.goal['uuid'], strategy=cls.strategy['uuid']) goal=cls.goal['uuid'], strategy=cls.strategy['uuid'])

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

@ -96,7 +96,6 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
wait_until='ACTIVE', wait_until='ACTIVE',
clients=self.mgr) clients=self.mgr)
@test.services('compute', 'network', 'image')
def test_execute_basic_action_plan(self): def test_execute_basic_action_plan(self):
"""Execute an action plan based on the BASIC strategy """Execute an action plan based on the BASIC strategy
@ -114,7 +113,7 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
self.assertTrue(test.call_until_true( self.assertTrue(test.call_until_true(
func=functools.partial(self.has_audit_succeeded, audit['uuid']), func=functools.partial(self.has_audit_succeeded, audit['uuid']),
duration=300, duration=600,
sleep_for=2 sleep_for=2
)) ))
_, action_plans = self.client.list_action_plans( _, action_plans = self.client.list_action_plans(
@ -132,7 +131,7 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
self.assertTrue(test.call_until_true( self.assertTrue(test.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=300, duration=600,
sleep_for=2 sleep_for=2
)) ))
_, finished_ap = self.client.show_action_plan(action_plan['uuid']) _, finished_ap = self.client.show_action_plan(action_plan['uuid'])