openstack/watcher
Code Issues Proposed changes

Merge "Fixed flaky tempest test"

Browse Source
This commit is contained in:
Jenkins 2016-05-24 09:25:15 +00:00 committed by Gerrit Code Review
commit 4e3caaa157
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,9 @@ from watcher_tempest_plugin.tests.api.admin import base
class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest): class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
"""Tests for audit.""" """Tests for audit."""
audit_states = ['ONGOING', 'SUCCEEDED', 'SUBMITTED', 'FAILED',
'CANCELLED', 'DELETED', 'PENDING']
def assert_expected(self, expected, actual, def assert_expected(self, expected, actual,
keys=('created_at', 'updated_at', keys=('created_at', 'updated_at',
'deleted_at', 'state')): 'deleted_at', 'state')):
@ -102,7 +105,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
_, audit = self.client.show_audit(body['uuid']) _, audit = self.client.show_audit(body['uuid'])
initial_audit_state = audit.pop('state') initial_audit_state = audit.pop('state')
self.assertEqual('PENDING', initial_audit_state) self.assertIn(initial_audit_state, self.audit_states)
self.assert_expected(audit, body) self.assert_expected(audit, body)