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

Fixed tense consistency (used past) in statuses

Browse Source 
In several places in Watcher, there are statuses which corresponds
to a status in the respective life cycle. There were used past tense
everywhere, except "SUCCESS" which was written in present tense.

So I searched for all the occurences of this state, and replaced them
with their past tense form.

Change-Id: Ic41def96d1a608da06a1e394e24704d4f06ab32a
Closes-Bug: #1520276
This commit is contained in:
Gábor Antal
2015-11-27 18:53:34 +01:00
parent a809b8d52c
commit 6e1e445e55
13 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -467,7 +467,7 @@ class TestPatch(api_base.FunctionalTest):
self.assertTrue(response.json['error_message'])
def test_add_ok(self):
new_state = 'SUCCESS'
new_state = 'SUCCEEDED'
response = self.patch_json(
'/actions/%s' % self.action.uuid,
[{'path': '/state', 'value': new_state, 'op': 'add'}])

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

@@ -360,7 +360,7 @@ class TestPatch(api_base.FunctionalTest):
self.assertTrue(response.json['error_message'])
def test_add_ok(self):
new_state = 'SUCCESS'
new_state = 'SUCCEEDED'
response = self.patch_json(
'/audits/%s' % self.audit.uuid,
[{'path': '/state', 'value': new_state, 'op': 'add'}])

8
watcher/tests/applier/framework/command/test_launch_action_plan_command.py
View File

@@ -52,7 +52,7 @@ class TestLaunchActionPlanCommand(DbTestCase):
command.execute()
action_plan = ActionPlan.get_by_uuid(self.context,
self.action_plan.uuid)
self.assertEqual(Status.SUCCESS, action_plan.state)
self.assertEqual(Status.SUCCEEDED, action_plan.state)
def test_trigger_audit_send_notification(self):
messaging = MagicMock()
@@ -63,10 +63,10 @@ class TestLaunchActionPlanCommand(DbTestCase):
call_on_going = call(Events.LAUNCH_ACTION_PLAN.name, {
'action_plan_status': Status.ONGOING,
'action_plan__uuid': self.action_plan.uuid})
call_success = call(Events.LAUNCH_ACTION_PLAN.name, {
'action_plan_status': Status.SUCCESS,
call_succeeded = call(Events.LAUNCH_ACTION_PLAN.name, {
'action_plan_status': Status.SUCCEEDED,
'action_plan__uuid': self.action_plan.uuid})
calls = [call_on_going, call_success]
calls = [call_on_going, call_succeeded]
messaging.topic_status.publish_event.assert_has_calls(calls)
self.assertEqual(2, messaging.topic_status.publish_event.call_count)

8
watcher/tests/decision_engine/command/test_trigger_audit_command.py
View File

@@ -49,7 +49,7 @@ class TestTriggerAuditCommand(DbTestCase):
command.strategy_context.execute_strategy = MagicMock()
command.execute(self.audit.uuid, self.context)
audit = Audit.get_by_uuid(self.context, self.audit.uuid)
self.assertEqual(AuditStatus.SUCCESS, audit.state)
self.assertEqual(AuditStatus.SUCCEEDED, audit.state)
def test_trigger_audit_send_notification(self):
messaging = MagicMock()
@@ -62,10 +62,10 @@ class TestTriggerAuditCommand(DbTestCase):
call_on_going = call(Events.TRIGGER_AUDIT.name, {
'audit_status': AuditStatus.ONGOING,
'audit_uuid': self.audit.uuid})
call_success = call(Events.TRIGGER_AUDIT.name, {
'audit_status': AuditStatus.SUCCESS,
call_succeeded = call(Events.TRIGGER_AUDIT.name, {
'audit_status': AuditStatus.SUCCEEDED,
'audit_uuid': self.audit.uuid})
calls = [call_on_going, call_success]
calls = [call_on_going, call_succeeded]
messaging.topic_status.publish_event.assert_has_calls(calls)
self.assertEqual(2, messaging.topic_status.publish_event.call_count)

4
watcher/tests/objects/test_action.py
View File

@@ -93,12 +93,12 @@ class TestActionObject(base.DbTestCase):
with mock.patch.object(self.dbapi, 'update_action',
autospec=True) as mock_update_action:
action = objects.Action.get_by_uuid(self.context, uuid)
action.state = 'SUCCESS'
action.state = 'SUCCEEDED'
action.save()
mock_get_action.assert_called_once_with(self.context, uuid)
mock_update_action.assert_called_once_with(
uuid, {'state': 'SUCCESS'})
uuid, {'state': 'SUCCEEDED'})
self.assertEqual(self.context, action._context)
def test_refresh(self):

4
watcher/tests/objects/test_action_plan.py
View File

@@ -97,13 +97,13 @@ class TestActionPlanObject(base.DbTestCase):
autospec=True) as mock_update_action_plan:
action_plan = objects.ActionPlan.get_by_uuid(
self.context, uuid)
action_plan.state = 'SUCCESS'
action_plan.state = 'SUCCEEDED'
action_plan.save()
mock_get_action_plan.assert_called_once_with(
self.context, uuid)
mock_update_action_plan.assert_called_once_with(
uuid, {'state': 'SUCCESS'})
uuid, {'state': 'SUCCEEDED'})
self.assertEqual(self.context, action_plan._context)
def test_refresh(self):

4
watcher/tests/objects/test_audit.py
View File

@@ -93,12 +93,12 @@ class TestAuditObject(base.DbTestCase):
with mock.patch.object(self.dbapi, 'update_audit',
autospec=True) as mock_update_audit:
audit = objects.Audit.get_by_uuid(self.context, uuid)
audit.state = 'SUCCESS'
audit.state = 'SUCCEEDED'
audit.save()
mock_get_audit.assert_called_once_with(self.context, uuid)
mock_update_audit.assert_called_once_with(
uuid, {'state': 'SUCCESS'})
uuid, {'state': 'SUCCEEDED'})
self.assertEqual(self.context, audit._context)
def test_refresh(self):