openstack/watcher-tempest-plugin
Code Issues Proposed changes

Merge "fix multinode tempest test failure"

Browse Source
This commit is contained in:
Jenkins 2017-06-14 02:27:25 +00:00 committed by Gerrit Code Review
commit a277dd8866
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,12 +81,16 @@ 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_utils.call_until_true( try:
func=functools.partial( test_utils.call_until_true(
cls.is_action_plan_idle, action_plan['uuid']), func=functools.partial(
duration=30, cls.is_action_plan_idle, action_plan['uuid']),
sleep_for=.5 duration=30,
) sleep_for=.5
)
except Exception:
action_plans_to_be_deleted.remove(
action_plan['uuid'])
# Phase 2: Delete them all # Phase 2: Delete them all
for action_plan_uuid in action_plans_to_be_deleted: for action_plan_uuid in action_plans_to_be_deleted:

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

@ -124,7 +124,8 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
) )
_, action_plans = cls.client.list_action_plans( _, action_plans = cls.client.list_action_plans(
audit_uuid=cls.audit['uuid']) audit_uuid=cls.audit['uuid'])
cls.action_plan = action_plans['action_plans'][0] if len(action_plans['action_plans']) > 0:
cls.action_plan = action_plans['action_plans'][0]
@decorators.attr(type='smoke') @decorators.attr(type='smoke')
def test_show_action_plan(self): def test_show_action_plan(self):

21
watcher_tempest_plugin/tests/api/admin/test_service.py
View File

@ -38,7 +38,15 @@ class TestShowListService(base.BaseInfraOptimTest):
@decorators.attr(type='smoke') @decorators.attr(type='smoke')
def test_show_service(self): def test_show_service(self):
_, service = self.client.show_service(self.DECISION_ENGINE) _, body = self.client.list_services()
self.assertIn('services', body)
services = body['services']
self.assertIn(self.DECISION_ENGINE,
[i['name'] for i in body['services']])
service_id = filter(lambda x: self.DECISION_ENGINE == x['name'],
services)[0]['id']
_, service = self.client.show_service(service_id)
self.assertEqual(self.DECISION_ENGINE, service['name']) self.assertEqual(self.DECISION_ENGINE, service['name'])
self.assertIn("host", service.keys()) self.assertIn("host", service.keys())
@ -47,7 +55,16 @@ class TestShowListService(base.BaseInfraOptimTest):
@decorators.attr(type='smoke') @decorators.attr(type='smoke')
def test_show_service_with_links(self): def test_show_service_with_links(self):
_, service = self.client.show_service(self.DECISION_ENGINE) _, body = self.client.list_services()
self.assertIn('services', body)
services = body['services']
self.assertIn(self.DECISION_ENGINE,
[i['name'] for i in body['services']])
service_id = filter(lambda x: self.DECISION_ENGINE == x['name'],
services)[0]['id']
_, service = self.client.show_service(service_id)
self.assertIn('links', service.keys()) self.assertIn('links', service.keys())
self.assertEqual(2, len(service['links'])) self.assertEqual(2, len(service['links']))
self.assertIn(str(service['id']), self.assertIn(str(service['id']),