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

19
watcher_tempest_plugin/tests/api/admin/test_action.py
View File

@@ -47,9 +47,10 @@ class TestShowListAction(base.BaseInfraOptimTest):
_, action = self.client.show_action(
self.action_plan["first_action_uuid"])
self.assertEqual(action['uuid'], self.action_plan["first_action_uuid"])
self.assertEqual(action['action_type'], "nop")
self.assertEqual(action['state'], "PENDING")
self.assertEqual(self.action_plan["first_action_uuid"],
action['uuid'])
self.assertEqual("nop", action['action_type'])
self.assertEqual("PENDING", action['state'])
@test.attr(type='smoke')
def test_show_action_with_links(self):
@@ -81,9 +82,9 @@ class TestShowListAction(base.BaseInfraOptimTest):
act['action_type'] for act in body['actions'])
# A dummy strategy generates 2 "nop" actions and 1 "sleep" action
self.assertEqual(len(body['actions']), 3)
self.assertEqual(action_counter.get("nop"), 2)
self.assertEqual(action_counter.get("sleep"), 1)
self.assertEqual(3, len(body['actions']))
self.assertEqual(2, action_counter.get("nop"))
self.assertEqual(1, action_counter.get("sleep"))
@test.attr(type="smoke")
def test_list_actions_by_audit(self):
@@ -97,6 +98,6 @@ class TestShowListAction(base.BaseInfraOptimTest):
act['action_type'] for act in body['actions'])
# A dummy strategy generates 2 "nop" actions and 1 "sleep" action
self.assertEqual(len(body['actions']), 3)
self.assertEqual(action_counter.get("nop"), 2)
self.assertEqual(action_counter.get("sleep"), 1)
self.assertEqual(3, len(body['actions']))
self.assertEqual(2, action_counter.get("nop"))
self.assertEqual(1, action_counter.get("sleep"))

8
watcher_tempest_plugin/tests/api/admin/test_action_plan.py
View File

@@ -43,8 +43,8 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
_, action_plan = self.client.show_action_plan(action_plan['uuid'])
self.assertEqual(action_plan['audit_uuid'], audit['uuid'])
self.assertEqual(action_plan['state'], 'RECOMMENDED')
self.assertEqual(audit['uuid'], action_plan['audit_uuid'])
self.assertEqual('RECOMMENDED', action_plan['state'])
@test.attr(type='smoke')
def test_delete_action_plan(self):
@@ -98,7 +98,7 @@ class TestCreateDeleteExecuteActionPlan(base.BaseInfraOptimTest):
_, finished_ap = self.client.show_action_plan(action_plan['uuid'])
self.assertIn(updated_ap['state'], ('PENDING', 'ONGOING'))
self.assertEqual(finished_ap['state'], 'SUCCEEDED')
self.assertEqual('SUCCEEDED', finished_ap['state'])
class TestShowListActionPlan(base.BaseInfraOptimTest):
@@ -164,5 +164,5 @@ class TestShowListActionPlan(base.BaseInfraOptimTest):
next_marker = body['action_plans'][-1]['uuid']
self.assertEqual(len(body['action_plans']), 3)
self.assertEqual(3, len(body['action_plans']))
self.assertIn(next_marker, body['next'])

2
watcher_tempest_plugin/tests/api/admin/test_api_discovery.py
View File

@@ -35,7 +35,7 @@ class TestApiDiscovery(base.BaseInfraOptimTest):
def test_default_version(self):
_, descr = self.client.get_api_description()
default_version = descr['default_version']
self.assertEqual(default_version['id'], 'v1')
self.assertEqual('v1', default_version['id'])
@test.attr(type='smoke')
def test_version_1_resources(self):

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

@@ -101,7 +101,7 @@ class TestCreateUpdateDeleteAudit(base.BaseInfraOptimTest):
_, audit = self.client.show_audit(body['uuid'])
initial_audit_state = audit.pop('state')
self.assertEqual(initial_audit_state, 'PENDING')
self.assertEqual('PENDING', initial_audit_state)
self.assert_expected(audit, body)
@@ -176,7 +176,7 @@ class TestShowListAudit(base.BaseInfraOptimTest):
_, body = self.client.list_audits(limit=3)
next_marker = body['audits'][-1]['uuid']
self.assertEqual(len(body['audits']), 3)
self.assertEqual(3, len(body['audits']))
self.assertIn(next_marker, body['next'])
@test.attr(type='smoke')

2
watcher_tempest_plugin/tests/api/admin/test_audit_template.py
View File

@@ -121,7 +121,7 @@ class TestAuditTemplate(base.BaseInfraOptimTest):
_, body = self.client.list_audit_templates(limit=3)
next_marker = body['audit_templates'][-1]['uuid']
self.assertEqual(len(body['audit_templates']), 3)
self.assertEqual(3, len(body['audit_templates']))
self.assertIn(next_marker, body['next'])
@test.attr(type='smoke')

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

@@ -39,8 +39,8 @@ class TestShowListGoal(base.BaseInfraOptimTest):
def test_show_goal(self):
_, goal = self.client.show_goal(self.DUMMY_GOAL)
self.assertEqual(goal['name'], self.DUMMY_GOAL)
self.assertEqual(goal['strategy'], "dummy")
self.assertEqual(self.DUMMY_GOAL, goal['name'])
self.assertEqual("dummy", goal['strategy'])
@test.attr(type='smoke')
def test_show_goal_with_links(self):

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

@@ -140,7 +140,7 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest):
action_plan_uuid=finished_ap["uuid"])
self.assertIn(updated_ap['state'], ('PENDING', 'ONGOING'))
self.assertEqual(finished_ap['state'], 'SUCCEEDED')
self.assertEqual('SUCCEEDED', finished_ap['state'])
for action in action_list['actions']:
self.assertEqual(action.get('state'), 'SUCCEEDED')
self.assertEqual('SUCCEEDED', action.get('state'))

8
watcher_tempest_plugin/tests/scenario/test_execute_dummy_optim.py
View File

@@ -71,9 +71,9 @@ class TestExecuteDummyStrategy(base.BaseInfraOptimScenarioTest):
act['action_type'] for act in action_list['actions'])
self.assertIn(updated_ap['state'], ('PENDING', 'ONGOING'))
self.assertEqual(finished_ap['state'], 'SUCCEEDED')
self.assertEqual('SUCCEEDED', finished_ap['state'])
# A dummy strategy generates 2 "nop" actions and 1 "sleep" action
self.assertEqual(len(action_list['actions']), 3)
self.assertEqual(action_counter.get("nop"), 2)
self.assertEqual(action_counter.get("sleep"), 1)
self.assertEqual(3, len(action_list['actions']))
self.assertEqual(2, action_counter.get("nop"))
self.assertEqual(1, action_counter.get("sleep"))