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

Fixed wrongly used assertEqual method

Browse Source 
In several places, assertEqual is used the following way:
  assertEqual(observed, expected)
However, the correct way to use assertEqual is:
  assertEqual(expected, observed)

Change-Id: I5a7442f4adf98bf7bc73cef1d17d20da39d9a7f8
Closes-Bug: #1551861
This commit is contained in:
Gábor Antal
2016-03-01 18:14:05 +01:00
parent 1acacaa812
commit c440cdd69f
40 changed files with 163 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/tests/applier/actions/test_migration.py
View File

@@ -152,7 +152,7 @@ class TestMigration(base.TestCase):
exc = self.assertRaises(
exception.InstanceNotFound, self.action.execute)
self.m_helper.find_instance.assert_called_once_with(self.INSTANCE_UUID)
self.assertEqual(exc.kwargs["name"], self.INSTANCE_UUID)
self.assertEqual(self.INSTANCE_UUID, exc.kwargs["name"])
def test_execute_live_migration(self):
self.m_helper.find_instance.return_value = self.INSTANCE_UUID

2
watcher/tests/applier/messaging/test_trigger_action_plan_endpoint.py
View File

@@ -38,4 +38,4 @@ class TestTriggerActionPlan(base.TestCase):
action_plan_uuid = utils.generate_uuid()
expected_uuid = self.endpoint.launch_action_plan(self.context,
action_plan_uuid)
self.assertEqual(action_plan_uuid, expected_uuid)
self.assertEqual(expected_uuid, action_plan_uuid)

4
watcher/tests/applier/test_applier_manager.py
View File

@@ -35,5 +35,5 @@ class TestApplierManager(base.TestCase):
def test_connect(self, m_messaging, m_thread):
self.applier.connect()
self.applier.join()
self.assertEqual(m_messaging.call_count, 2)
self.assertEqual(m_thread.call_count, 1)
self.assertEqual(2, m_messaging.call_count)
self.assertEqual(1, m_thread.call_count)

16
watcher/tests/applier/workflow_engine/test_default_workflow_engine.py
View File

@@ -66,7 +66,7 @@ class TestDefaultWorkFlowEngine(base.DbTestCase):
def test_execute(self):
actions = mock.MagicMock()
result = self.engine.execute(actions)
self.assertEqual(result, True)
self.assertEqual(True, result)
def create_action(self, action_type, parameters, next):
action = {
@@ -85,7 +85,7 @@ class TestDefaultWorkFlowEngine(base.DbTestCase):
def check_action_state(self, action, expected_state):
to_check = objects.Action.get_by_uuid(self.context, action.uuid)
self.assertEqual(to_check.state, expected_state)
self.assertEqual(expected_state, to_check.state)
def check_actions_state(self, actions, expected_state):
for a in actions:
@@ -94,12 +94,12 @@ class TestDefaultWorkFlowEngine(base.DbTestCase):
def test_execute_with_no_actions(self):
actions = []
result = self.engine.execute(actions)
self.assertEqual(result, True)
self.assertEqual(True, result)
def test_execute_with_one_action(self):
actions = [self.create_action("nop", {'message': 'test'}, None)]
result = self.engine.execute(actions)
self.assertEqual(result, True)
self.assertEqual(True, result)
self.check_actions_state(actions, objects.action.State.SUCCEEDED)
def test_execute_with_two_actions(self):
@@ -111,7 +111,7 @@ class TestDefaultWorkFlowEngine(base.DbTestCase):
actions.append(next)
result = self.engine.execute(actions)
self.assertEqual(result, True)
self.assertEqual(True, result)
self.check_actions_state(actions, objects.action.State.SUCCEEDED)
def test_execute_with_three_actions(self):
@@ -128,7 +128,7 @@ class TestDefaultWorkFlowEngine(base.DbTestCase):
actions.append(next2)
result = self.engine.execute(actions)
self.assertEqual(result, True)
self.assertEqual(True, result)
self.check_actions_state(actions, objects.action.State.SUCCEEDED)
def test_execute_with_exception(self):
@@ -145,7 +145,7 @@ class TestDefaultWorkFlowEngine(base.DbTestCase):
actions.append(next2)
result = self.engine.execute(actions)
self.assertEqual(result, False)
self.assertEqual(False, result)
self.check_action_state(first, objects.action.State.SUCCEEDED)
self.check_action_state(next, objects.action.State.SUCCEEDED)
self.check_action_state(next2, objects.action.State.FAILED)
@@ -162,5 +162,5 @@ class TestDefaultWorkFlowEngine(base.DbTestCase):
namespace=FakeAction.namespace())
actions = [self.create_action("dontcare", {}, None)]
result = self.engine.execute(actions)
self.assertEqual(result, False)
self.assertEqual(False, result)
self.check_action_state(actions[0], objects.action.State.FAILED)