Fixed wrongly used assertEqual method

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

View File

@@ -44,7 +44,7 @@ class TestApiUtilsValidScenarios(base.TestCase):
cfg.CONF.set_override("max_limit", self.max_limit, group="api",
enforce_type=True)
actual_limit = v1_utils.validate_limit(self.limit)
self.assertEqual(actual_limit, self.expected)
self.assertEqual(self.expected, actual_limit)
class TestApiUtilsInvalidScenarios(base.TestCase):

View File

@@ -310,16 +310,15 @@ class TestListAction(api_base.FunctionalTest):
self.assertEqual(len(ap2_action_list), len(response['actions']))
# We deleted them so that's normal
self.assertEqual(
[act for act in response['actions']
if act['action_plan_uuid'] == action_plan1.uuid],
[])
self.assertEqual([],
[act for act in response['actions']
if act['action_plan_uuid'] == action_plan1.uuid])
# Here are the 2 actions left
self.assertEqual(
set([act.as_dict()['uuid'] for act in ap2_action_list]),
set([act['uuid'] for act in response['actions']
if act['action_plan_uuid'] == action_plan2.uuid]),
set([act.as_dict()['uuid'] for act in ap2_action_list]))
if act['action_plan_uuid'] == action_plan2.uuid]))
def test_many_with_next_uuid(self):
action_list = []
@@ -584,7 +583,7 @@ class TestDelete(api_base.FunctionalTest):
return_deleted_at = timeutils.strtime(action['deleted_at'])
self.assertEqual(timeutils.strtime(test_time), return_deleted_at)
self.assertEqual(action['state'], 'DELETED')
self.assertEqual('DELETED', action['state'])
def test_delete_action_not_found(self):
uuid = utils.generate_uuid()

View File

@@ -334,7 +334,7 @@ class TestDelete(api_base.FunctionalTest):
self.assertTrue(ap_response.json['error_message'])
# Nor does the action
self.assertEqual(len(acts_response['actions']), 0)
self.assertEqual(0, len(acts_response['actions']))
self.assertEqual(404, act_response.status_int)
self.assertEqual('application/json', act_response.content_type)
self.assertTrue(act_response.json['error_message'])

View File

@@ -564,7 +564,7 @@ class TestDelete(api_base.FunctionalTest):
return_deleted_at = timeutils.strtime(audit['deleted_at'])
self.assertEqual(timeutils.strtime(test_time), return_deleted_at)
self.assertEqual(audit['state'], 'DELETED')
self.assertEqual('DELETED', audit['state'])
def test_delete_audit_not_found(self):
uuid = utils.generate_uuid()