openstack
/
watcher-tempest-plugin
Code Issues Proposed changes

Merge "improve audit tempest test"

This commit is contained in:
Zuul 2018-09-26 10:15:03 +00:00 committed by Gerrit Code Review
parent f495aba064 c8660ea610
commit c3c13ecda6
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,7 +166,7 @@ class BaseInfraOptimTest(test.BaseTestCase):
@classmethod
def create_audit(cls, audit_template_uuid, audit_type='ONESHOT',
state=None, interval=None, parameters=None):
state=None, interval=None, parameters=None, name=None):
"""Wrapper utility for creating a test audit
:param audit_template_uuid: Audit Template UUID this audit will use
@ -178,7 +178,7 @@ class BaseInfraOptimTest(test.BaseTestCase):
"""
resp, body = cls.client.create_audit(
audit_template_uuid=audit_template_uuid, audit_type=audit_type,
state=state, interval=interval, parameters=parameters)
state=state, interval=interval, parameters=parameters, name=name)
cls.created_audits.add(body['uuid'])
cls.created_action_plans_audit_uuids.add(body['uuid'])

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

@ -45,6 +45,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
audit_params = dict(
audit_template_uuid=audit_template['uuid'],
audit_type='ONESHOT',
name='audit_oneshot',
)
_, body = self.create_audit(**audit_params)
@ -65,6 +66,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
audit_template_uuid=audit_template['uuid'],
audit_type='CONTINUOUS',
interval='7200',
name='audit_continuous',
)
_, body = self.create_audit(**audit_params)
@ -88,6 +90,9 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
sleep_for=.5
)
_, audit = self.client.show_audit(body['uuid'])
self.assertEqual(audit['state'], 'CANCELLED')
@decorators.attr(type='smoke')
def test_create_audit_with_wrong_audit_template(self):
audit_params = dict(
@ -129,8 +134,6 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
_, audit = self.client.show_audit(body['uuid'])
initial_audit_state = audit.pop('state')
if audit.get('hostname'):
del audit['hostname']
self.assertIn(initial_audit_state, self.audit_states)
self.assert_expected(audit, body)
@ -222,15 +225,11 @@ class TestShowListAudit(base.BaseInfraOptimTest):
self.audit['uuid'])
initial_audit = self.audit.copy()
del initial_audit['state']
del initial_audit['hostname']
audit_state = audit['state']
actual_audit = audit.copy()
del actual_audit['state']
self.assertIn(audit_state, self.audit_states)
self.assertIsNotNone(actual_audit['hostname'])
del actual_audit['hostname']
self.assert_expected(initial_audit, actual_audit)
@decorators.attr(type='smoke')