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

Merge "Remove unused SUBMITTED audit state"

Browse Source
This commit is contained in:
Jenkins
2016-11-14 15:09:57 +00:00
committed by Gerrit Code Review
parent abd93a298e 4973dd6bf6
commit 01118b72c7
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/tests/api/v1/test_actions.py
View File

@@ -444,7 +444,7 @@ class TestPatch(api_base.FunctionalTest):
def test_patch_not_allowed(self, mock_utcnow):
test_time = datetime.datetime(2000, 1, 1, 0, 0)
mock_utcnow.return_value = test_time
new_state = objects.audit.State.SUBMITTED
new_state = objects.audit.State.SUCCEEDED
response = self.get_json('/actions/%s' % self.action.uuid)
self.assertNotEqual(new_state, response['state'])

2
watcher/tests/api/v1/test_audit_templates.py
View File

@@ -697,7 +697,7 @@ class TestAuditTemplatePolicyEnforcement(api_base.FunctionalTest):
self._common_policy_check(
"audit_template:update", self.patch_json,
'/audit_templates/%s' % audit_template.uuid,
[{'path': '/state', 'value': objects.audit.State.SUBMITTED,
[{'path': '/state', 'value': objects.audit.State.SUCCEEDED,
'op': 'replace'}], expect_errors=True)
def test_policy_disallow_create(self):

6
watcher/tests/api/v1/test_audits.py
View File

@@ -267,7 +267,7 @@ class TestPatch(api_base.FunctionalTest):
test_time = datetime.datetime(2000, 1, 1, 0, 0)
mock_utcnow.return_value = test_time
new_state = objects.audit.State.SUBMITTED
new_state = objects.audit.State.SUCCEEDED
response = self.get_json('/audits/%s' % self.audit.uuid)
self.assertNotEqual(new_state, response['state'])
@@ -287,7 +287,7 @@ class TestPatch(api_base.FunctionalTest):
def test_replace_non_existent_audit(self):
response = self.patch_json(
'/audits/%s' % utils.generate_uuid(),
[{'path': '/state', 'value': objects.audit.State.SUBMITTED,
[{'path': '/state', 'value': objects.audit.State.SUCCEEDED,
'op': 'replace'}], expect_errors=True)
self.assertEqual(404, response.status_int)
self.assertEqual('application/json', response.content_type)
@@ -722,7 +722,7 @@ class TestAuditPolicyEnforcement(api_base.FunctionalTest):
self._common_policy_check(
"audit:update", self.patch_json,
'/audits/%s' % audit.uuid,
[{'path': '/state', 'value': objects.audit.State.SUBMITTED,
[{'path': '/state', 'value': objects.audit.State.SUCCEEDED,
'op': 'replace'}], expect_errors=True)
def test_policy_disallow_create(self):