Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix field type to audit_type"

Browse Source
This commit is contained in:
Jenkins
2016-07-07 08:57:44 +00:00
committed by Gerrit Code Review
parent d61c4c12d1 47ff9bb105
commit b1c6ea71a4
12 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,7 +155,7 @@ class BaseInfraOptimTest(test.BaseTestCase):
# ### AUDITS ### #
@classmethod
def create_audit(cls, audit_template_uuid, type='ONESHOT',
def create_audit(cls, audit_template_uuid, audit_type='ONESHOT',
state=None, deadline=None):
"""Wrapper utility for creating a test audit
@@ -166,7 +166,7 @@ class BaseInfraOptimTest(test.BaseTestCase):
:return: A tuple with The HTTP response and its body
"""
resp, body = cls.client.create_audit(
audit_template_uuid=audit_template_uuid, type=type,
audit_template_uuid=audit_template_uuid, audit_type=audit_type,
state=state, deadline=deadline)
cls.created_audits.add(body['uuid'])

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

@@ -41,7 +41,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
audit_params = dict(
audit_template_uuid=audit_template['uuid'],
type='ONESHOT',
audit_type='ONESHOT',
)
_, body = self.create_audit(**audit_params)
@@ -57,7 +57,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
audit_params = dict(
audit_template_uuid=audit_template['uuid'],
type='CONTINUOUS',
audit_type='CONTINUOUS',
)
_, body = self.create_audit(**audit_params)
@@ -70,7 +70,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
def test_create_audit_with_wrong_audit_template(self):
audit_params = dict(
audit_template_uuid='INVALID',
type='ONESHOT',
audit_type='ONESHOT',
)
self.assertRaises(

4
watcher_tempest_plugin/tests/scenario/base.py
View File

@@ -111,7 +111,7 @@ class BaseInfraOptimScenarioTest(manager.ScenarioTest):
# ### AUDITS ### #
def create_audit(self, audit_template_uuid, type='ONESHOT',
def create_audit(self, audit_template_uuid, audit_type='ONESHOT',
state=None, deadline=None):
"""Wrapper utility for creating a test audit
@@ -120,7 +120,7 @@ class BaseInfraOptimScenarioTest(manager.ScenarioTest):
:return: A tuple with The HTTP response and its body
"""
resp, body = self.client.create_audit(
audit_template_uuid=audit_template_uuid, type=type,
audit_template_uuid=audit_template_uuid, audit_type=audit_type,
state=state, deadline=deadline)
self.addCleanup(self.delete_audit, audit_uuid=body["uuid"])