openstack/python-watcherclient
Code Issues Proposed changes

Merge "Add continuous audit functional test"

Browse Source
This commit is contained in:
Zuul
2018-12-06 14:43:31 +00:00
committed by Gerrit Code Review
parent c256ee2a21 98e09044c1
commit 6c66276040
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
watcherclient/tests/functional/v1/base.py
View File

@@ -140,5 +140,9 @@ class TestCase(testtools.TestCase):
@classmethod @classmethod
def has_audit_created(cls, audit_uuid): def has_audit_created(cls, audit_uuid):
return cls.parse_show_as_object( audit = cls.parse_show_as_object(
cls.watcher('audit show %s' % audit_uuid))['State'] == 'SUCCEEDED' cls.watcher('audit show %s' % audit_uuid))
if audit['Audit Type'] == 'ONESHOT':
return audit['State'] == 'SUCCEEDED'
else:
return audit['State'] == 'ONGOING'

27
watcherclient/tests/functional/v1/test_audit.py
View File

@@ -114,13 +114,13 @@ class AuditActiveTests(base.TestCase):
self.watcher('actionplan delete %s' % action_plan_uuid) self.watcher('actionplan delete %s' % action_plan_uuid)
self.watcher('audit delete %s' % audit_uuid) self.watcher('audit delete %s' % audit_uuid)
def test_create_audit(self): def test_create_oneshot_audit(self):
audit = self.watcher('audit create -a %s' % self.audit_template_name) audit = self.watcher('audit create -a %s' % self.audit_template_name)
audit_uuid = self.parse_show_as_object(audit)['UUID'] audit_uuid = self.parse_show_as_object(audit)['UUID']
self.assert_table_structure([audit], self.detailed_list_fields) self.assert_table_structure([audit], self.detailed_list_fields)
self._delete_audit(audit_uuid) self._delete_audit(audit_uuid)
def test_delete_audit(self): def test_delete_oneshot_audit(self):
audit_uuid = self._create_audit() audit_uuid = self._create_audit()
self.assertTrue(test_utils.call_until_true( self.assertTrue(test_utils.call_until_true(
func=functools.partial( func=functools.partial(
@@ -134,3 +134,26 @@ class AuditActiveTests(base.TestCase):
self.watcher('actionplan list --audit %s' % audit_uuid)) self.watcher('actionplan list --audit %s' % audit_uuid))
action_plan_uuid = list(output[0])[0] action_plan_uuid = list(output[0])[0]
self.watcher('actionplan delete %s' % action_plan_uuid) self.watcher('actionplan delete %s' % action_plan_uuid)
def test_continuous_audit(self):
audit = self.watcher('audit create -a %s -t CONTINUOUS -i 600'
% self.audit_template_name)
audit_uuid = self.parse_show_as_object(audit)['UUID']
self.assert_table_structure([audit], self.detailed_list_fields)
self.assertTrue(test_utils.call_until_true(
func=functools.partial(
self.has_audit_created, audit_uuid),
duration=600,
sleep_for=2
))
audit_state = self.parse_show_as_object(
self.watcher('audit show %s' % audit_uuid))['State']
if audit_state == 'ONGOING':
self.watcher('audit update %s replace state=CANCELLED'
% audit_uuid)
raw_output = self.watcher('audit delete %s' % audit_uuid)
self.assertOutput('', raw_output)
outputs = self.parse_listing(
self.watcher('actionplan list --audit %s' % audit_uuid))
for actionplan in outputs:
self.watcher('actionplan delete %s' % actionplan['UUID'])