From 101bd830753c5d2303942696a954f371ad29fc9b Mon Sep 17 00:00:00 2001 From: vishal mahajan Date: Tue, 12 Jan 2016 16:09:12 +0530 Subject: [PATCH] Fix the parameter order of assertEqual. On assertEqual, the order of parameters should be (expected, observed) but some tests use invalid order. Change-Id: I6bda4178844c6c5101825734ddc650a8793dbc8c --- tests/storages/test_swift.py | 20 ++++++++++---------- tests/test_apiclient_actions.py | 12 ++++++------ tests/test_apiclient_backup.py | 12 ++++++------ tests/test_apiclient_client.py | 18 +++++++++--------- tests/test_apiclient_jobs.py | 22 +++++++++++----------- tests/test_apiclient_registration.py | 10 +++++----- tests/test_apiclient_sessions.py | 16 ++++++++-------- tests/test_scheduler_daemon.py | 8 ++++---- 8 files changed, 59 insertions(+), 59 deletions(-) diff --git a/tests/storages/test_swift.py b/tests/storages/test_swift.py index 1929733b..20f06713 100644 --- a/tests/storages/test_swift.py +++ b/tests/storages/test_swift.py @@ -73,35 +73,35 @@ class TestSwiftStorage(unittest.TestCase): def test__get_backups(self): backups = base.Backup.parse_backups(self.files, self.storage) - self.assertEqual(len(backups), 1) + self.assertEqual(1, len(backups)) backup = backups[0] - self.assertEqual(backup, self.backup) + self.assertEqual(self.backup, backup) def test__get_backups_with_tar_only(self): backups = base.Backup.parse_backups( ["tar_metadata_hostname_backup_1000_0"], self.storage) - self.assertEqual(len(backups), 0) + self.assertEqual(0, len(backups)) def test__get_backups_without_tar(self): backups = base.Backup.parse_backups(["hostname_backup_1000_0"], self.storage) - self.assertEqual(len(backups), 1) + self.assertEqual(1, len(backups)) self.backup.tar_meta = False backup = backups[0] - self.assertEqual(backup, self.backup) + self.assertEqual(self.backup, backup) def test__get_backups_increment(self): backups = base.Backup.parse_backups(self.increments, self.storage) - self.assertEqual(len(backups), 1) + self.assertEqual(1, len(backups)) self.backup.add_increment(self.increment) backup = backups[0] - self.assertEqual(backup, self.backup) + self.assertEqual(self.backup, backup) def test__get_backups_increments(self): backups = base.Backup.parse_backups(self.cycles_increments, self.storage) - self.assertEqual(len(backups), 2) + self.assertEqual(2, len(backups)) self.backup.add_increment(self.increment) self.backup_2.add_increment(self.increment_2) - self.assertEqual(backups[0], self.backup) - self.assertEqual(backups[1], self.backup_2) + self.assertEqual(self.backup, backups[0]) + self.assertEqual(self.backup_2, backups[1]) diff --git a/tests/test_apiclient_actions.py b/tests/test_apiclient_actions.py index 47cf7281..7a6abdaa 100644 --- a/tests/test_apiclient_actions.py +++ b/tests/test_apiclient_actions.py @@ -34,8 +34,8 @@ class TestActionManager(unittest.TestCase): @patch('freezer.apiclient.actions.requests') def test_create(self, mock_requests): - self.assertEqual(self.action_manager.endpoint, 'http://testendpoint:9999/v1/actions/') - self.assertEqual(self.action_manager.headers, {'X-Auth-Token': 'testtoken'}) + self.assertEqual('http://testendpoint:9999/v1/actions/', self.action_manager.endpoint) + self.assertEqual({'X-Auth-Token': 'testtoken'}, self.action_manager.headers) @patch('freezer.apiclient.actions.requests') def test_create_ok(self, mock_requests): @@ -43,7 +43,7 @@ class TestActionManager(unittest.TestCase): self.mock_response.json.return_value = {'action_id': 'qwerqwer'} mock_requests.post.return_value = self.mock_response retval = self.action_manager.create({'action': 'metadata'}) - self.assertEqual(retval, 'qwerqwer') + self.assertEqual('qwerqwer', retval) @patch('freezer.apiclient.actions.requests') def test_create_fail_when_api_return_error_code(self, mock_requests): @@ -70,7 +70,7 @@ class TestActionManager(unittest.TestCase): self.mock_response.json.return_value = {'action_id': 'qwerqwer'} mock_requests.get.return_value = self.mock_response retval = self.action_manager.get('test_action_id') - self.assertEqual(retval, {'action_id': 'qwerqwer'}) + self.assertEqual({'action_id': 'qwerqwer'}, retval) @patch('freezer.apiclient.actions.requests') def test_get_fails_on_error_different_from_404(self, mock_requests): @@ -92,7 +92,7 @@ class TestActionManager(unittest.TestCase): self.mock_response.json.return_value = {'actions': action_list} mock_requests.get.return_value = self.mock_response retval = self.action_manager.list() - self.assertEqual(retval, action_list) + self.assertEqual(action_list, retval) @patch('freezer.apiclient.actions.requests') def test_list_error(self, mock_requests): @@ -112,7 +112,7 @@ class TestActionManager(unittest.TestCase): } mock_requests.patch.return_value = self.mock_response retval = self.action_manager.update('d454beec-1f3c-4d11-aa1a-404116a40502', {'status': 'bamboozled'}) - self.assertEqual(retval, 12) + self.assertEqual(12, retval) @patch('freezer.apiclient.actions.requests') def test_update_raise_MetadataUpdateFailure_when_api_return_error_code(self, mock_requests): diff --git a/tests/test_apiclient_backup.py b/tests/test_apiclient_backup.py index c26291c6..f10571c7 100644 --- a/tests/test_apiclient_backup.py +++ b/tests/test_apiclient_backup.py @@ -32,8 +32,8 @@ class TestBackupManager(unittest.TestCase): @patch('freezer.apiclient.backups.requests') def test_create(self, mock_requests): - self.assertEqual(self.b.endpoint, 'http://testendpoint:9999/v1/backups/') - self.assertEqual(self.b.headers, {'X-Auth-Token': 'testtoken'}) + self.assertEqual('http://testendpoint:9999/v1/backups/', self.b.endpoint) + self.assertEqual({'X-Auth-Token': 'testtoken'}, self.b.headers) @patch('freezer.apiclient.backups.requests') def test_create_ok(self, mock_requests): @@ -42,7 +42,7 @@ class TestBackupManager(unittest.TestCase): mock_response.json.return_value = {'backup_id': 'qwerqwer'} mock_requests.post.return_value = mock_response retval = self.b.create(backup_metadata={'backup': 'metadata'}) - self.assertEqual(retval, 'qwerqwer') + self.assertEqual('qwerqwer', retval) @patch('freezer.apiclient.backups.requests') def test_create_fail_when_api_return_error_code(self, mock_requests): @@ -73,7 +73,7 @@ class TestBackupManager(unittest.TestCase): mock_response.json.return_value = {'backup_id': 'qwerqwer'} mock_requests.get.return_value = mock_response retval = self.b.get('test_backup_id') - self.assertEqual(retval, {'backup_id': 'qwerqwer'}) + self.assertEqual({'backup_id': 'qwerqwer'}, retval) @patch('freezer.apiclient.backups.requests') def test_get_none(self, mock_requests): @@ -99,7 +99,7 @@ class TestBackupManager(unittest.TestCase): mock_response.json.return_value = {'backups': backup_list} mock_requests.get.return_value = mock_response retval = self.b.list() - self.assertEqual(retval, backup_list) + self.assertEqual(backup_list, retval) @patch('freezer.apiclient.backups.requests') @@ -118,7 +118,7 @@ class TestBackupManager(unittest.TestCase): data='{"time_before": 1428529956}', headers={'X-Auth-Token': 'testtoken'}, verify=True) - self.assertEqual(retval, backup_list) + self.assertEqual(backup_list, retval) @patch('freezer.apiclient.backups.requests') def test_list_error(self, mock_requests): diff --git a/tests/test_apiclient_client.py b/tests/test_apiclient_client.py index f5bf6d69..be2146e5 100644 --- a/tests/test_apiclient_client.py +++ b/tests/test_apiclient_client.py @@ -133,15 +133,15 @@ class TestClientMock(unittest.TestCase): 'opts': Mock()} c = client.Client(**kwargs) self.assertIsInstance(c, client.Client) - self.assertEqual(c.opts.os_token, 'alpha') - self.assertEqual(c.opts.os_username, 'bravo') - self.assertEqual(c.opts.os_password, 'charlie') - self.assertEqual(c.opts.os_tenant_name, 'delta') - self.assertEqual(c.opts.os_auth_url, 'echo') - self.assertEqual(c._session, 'foxtrot') - self.assertEqual(c.session, 'foxtrot') - self.assertEqual(c.endpoint, 'golf') - self.assertEqual(c.version, 'hotel') + self.assertEqual('alpha', c.opts.os_token) + self.assertEqual('bravo', c.opts.os_username) + self.assertEqual('charlie', c.opts.os_password) + self.assertEqual('delta', c.opts.os_tenant_name) + self.assertEqual('echo', c.opts.os_auth_url) + self.assertEqual('foxtrot', c._session) + self.assertEqual('foxtrot', c.session) + self.assertEqual('golf', c.endpoint) + self.assertEqual('hotel', c.version) @patch('freezer.apiclient.client.ksc_session') @patch('freezer.apiclient.client.get_auth_plugin') diff --git a/tests/test_apiclient_jobs.py b/tests/test_apiclient_jobs.py index dbfe3c00..b5a1bc73 100644 --- a/tests/test_apiclient_jobs.py +++ b/tests/test_apiclient_jobs.py @@ -36,8 +36,8 @@ class TestJobManager(unittest.TestCase): @patch('freezer.apiclient.jobs.requests') def test_create(self, mock_requests): - self.assertEqual(self.job_manager.endpoint, 'http://testendpoint:9999/v1/jobs/') - self.assertEqual(self.job_manager.headers, {'X-Auth-Token': 'testtoken'}) + self.assertEqual('http://testendpoint:9999/v1/jobs/', self.job_manager.endpoint) + self.assertEqual({'X-Auth-Token': 'testtoken'}, self.job_manager.headers) @patch('freezer.apiclient.jobs.requests') def test_create_ok(self, mock_requests): @@ -45,7 +45,7 @@ class TestJobManager(unittest.TestCase): self.mock_response.json.return_value = {'job_id': 'qwerqwer'} mock_requests.post.return_value = self.mock_response retval = self.job_manager.create({'job': 'metadata'}) - self.assertEqual(retval, 'qwerqwer') + self.assertEqual('qwerqwer', retval) @patch('freezer.apiclient.jobs.json') @patch('freezer.apiclient.jobs.requests') @@ -59,7 +59,7 @@ class TestJobManager(unittest.TestCase): mock_json.dumps.assert_called_with({'job': 'metadata', 'client_id': 'test_client_id_78900987'}) - self.assertEqual(retval, 'qwerqwer') + self.assertEqual('qwerqwer', retval) @patch('freezer.apiclient.jobs.json') @patch('freezer.apiclient.jobs.requests') @@ -73,7 +73,7 @@ class TestJobManager(unittest.TestCase): mock_json.dumps.assert_called_with({'job': 'metadata', 'client_id': 'parmenide'}) - self.assertEqual(retval, 'qwerqwer') + self.assertEqual('qwerqwer', retval) @patch('freezer.apiclient.jobs.requests') def test_create_fail_when_api_return_error_code(self, mock_requests): @@ -100,7 +100,7 @@ class TestJobManager(unittest.TestCase): self.mock_response.json.return_value = {'job_id': 'qwerqwer'} mock_requests.get.return_value = self.mock_response retval = self.job_manager.get('test_job_id') - self.assertEqual(retval, {'job_id': 'qwerqwer'}) + self.assertEqual({'job_id': 'qwerqwer'}, retval) @patch('freezer.apiclient.jobs.requests') def test_get_fails_on_error_different_from_404(self, mock_requests): @@ -122,7 +122,7 @@ class TestJobManager(unittest.TestCase): self.mock_response.json.return_value = {'jobs': job_list} mock_requests.get.return_value = self.mock_response retval = self.job_manager.list() - self.assertEqual(retval, job_list) + self.assertEqual(job_list, retval) @patch('freezer.apiclient.jobs.requests') def test_list_error(self, mock_requests): @@ -142,7 +142,7 @@ class TestJobManager(unittest.TestCase): } mock_requests.patch.return_value = self.mock_response retval = self.job_manager.update('d454beec-1f3c-4d11-aa1a-404116a40502', {'status': 'bamboozled'}) - self.assertEqual(retval, 12) + self.assertEqual(12, retval) @patch('freezer.apiclient.jobs.requests') def test_update_raise_MetadataUpdateFailure_when_api_return_error_code(self, mock_requests): @@ -169,7 +169,7 @@ class TestJobManager(unittest.TestCase): endpoint = '{0}/v1/jobs/{1}/event'.format(self.mock_client.endpoint, job_id) data = {"start": None} retval = self.job_manager.start_job(job_id) - self.assertEqual(retval, {'result': 'success'}) + self.assertEqual({'result': 'success'}, retval) args = mock_requests.post.call_args[0] kwargs = mock_requests.post.call_args[1] @@ -196,7 +196,7 @@ class TestJobManager(unittest.TestCase): endpoint = '{0}/v1/jobs/{1}/event'.format(self.mock_client.endpoint, job_id) data = {"stop": None} retval = self.job_manager.stop_job(job_id) - self.assertEqual(retval, {'result': 'success'}) + self.assertEqual({'result': 'success'}, retval) args = mock_requests.post.call_args[0] kwargs = mock_requests.post.call_args[1] @@ -223,7 +223,7 @@ class TestJobManager(unittest.TestCase): endpoint = '{0}/v1/jobs/{1}/event'.format(self.mock_client.endpoint, job_id) data = {"abort": None} retval = self.job_manager.abort_job(job_id) - self.assertEqual(retval, {'result': 'success'}) + self.assertEqual({'result': 'success'}, retval) args = mock_requests.post.call_args[0] kwargs = mock_requests.post.call_args[1] diff --git a/tests/test_apiclient_registration.py b/tests/test_apiclient_registration.py index ba07fa67..012a98c9 100644 --- a/tests/test_apiclient_registration.py +++ b/tests/test_apiclient_registration.py @@ -32,8 +32,8 @@ class TestRegistrationManager(unittest.TestCase): @patch('freezer.apiclient.registration.requests') def test_create(self, mock_requests): - self.assertEqual(self.r.endpoint, 'http://testendpoint:9999/v1/clients/') - self.assertEqual(self.r.headers, {'X-Auth-Token': 'testtoken'}) + self.assertEqual('http://testendpoint:9999/v1/clients/', self.r.endpoint) + self.assertEqual({'X-Auth-Token': 'testtoken'}, self.r.headers) @patch('freezer.apiclient.registration.requests') def test_create_ok(self, mock_requests): @@ -42,7 +42,7 @@ class TestRegistrationManager(unittest.TestCase): mock_response.json.return_value = {'client_id': 'qwerqwer'} mock_requests.post.return_value = mock_response retval = self.r.create(client_info={'client': 'metadata'}) - self.assertEqual(retval, 'qwerqwer') + self.assertEqual('qwerqwer', retval) @patch('freezer.apiclient.registration.requests') def test_create_fail_when_api_return_error_code(self, mock_requests): @@ -73,7 +73,7 @@ class TestRegistrationManager(unittest.TestCase): mock_response.json.return_value = {'client_id': 'qwerqwer'} mock_requests.get.return_value = mock_response retval = self.r.get('test_client_id') - self.assertEqual(retval, {'client_id': 'qwerqwer'}) + self.assertEqual({'client_id': 'qwerqwer'}, retval) @patch('freezer.apiclient.registration.requests') def test_get_none(self, mock_requests): @@ -98,7 +98,7 @@ class TestRegistrationManager(unittest.TestCase): mock_response.json.return_value = {'clients': client_list} mock_requests.get.return_value = mock_response retval = self.r.list() - self.assertEqual(retval, client_list) + self.assertEqual(client_list, retval) @patch('freezer.apiclient.registration.requests') def test_list_error(self, mock_requests): diff --git a/tests/test_apiclient_sessions.py b/tests/test_apiclient_sessions.py index 4cb116d2..8ab98270 100644 --- a/tests/test_apiclient_sessions.py +++ b/tests/test_apiclient_sessions.py @@ -37,8 +37,8 @@ class TestSessionManager(unittest.TestCase): @patch('freezer.apiclient.sessions.requests') def test_create(self, mock_requests): - self.assertEqual(self.session_manager.endpoint, self.endpoint) - self.assertEqual(self.session_manager.headers, self.headers) + self.assertEqual(self.endpoint, self.session_manager.endpoint) + self.assertEqual(self.headers, self.session_manager.headers) @patch('freezer.apiclient.sessions.requests') def test_create_ok(self, mock_requests): @@ -46,7 +46,7 @@ class TestSessionManager(unittest.TestCase): self.mock_response.json.return_value = {'session_id': 'qwerqwer'} mock_requests.post.return_value = self.mock_response retval = self.session_manager.create({'session': 'metadata'}) - self.assertEqual(retval, 'qwerqwer') + self.assertEqual('qwerqwer', retval) @patch('freezer.apiclient.sessions.requests') def test_create_raise_ApiClientException_when_api_return_error_code(self, mock_requests): @@ -73,7 +73,7 @@ class TestSessionManager(unittest.TestCase): self.mock_response.json.return_value = {'session_id': 'qwerqwer'} mock_requests.get.return_value = self.mock_response retval = self.session_manager.get('test_session_id') - self.assertEqual(retval, {'session_id': 'qwerqwer'}) + self.assertEqual({'session_id': 'qwerqwer'}, retval) @patch('freezer.apiclient.sessions.requests') def test_get_raise_ApiClientException_when_api_return_error_different_from_404(self, mock_requests): @@ -95,7 +95,7 @@ class TestSessionManager(unittest.TestCase): self.mock_response.json.return_value = {'sessions': session_list} mock_requests.get.return_value = self.mock_response retval = self.session_manager.list() - self.assertEqual(retval, session_list) + self.assertEqual(session_list, retval) @patch('freezer.apiclient.sessions.requests') def test_list_raise_ApiClientException_when_api_return_error_code(self, mock_requests): @@ -115,7 +115,7 @@ class TestSessionManager(unittest.TestCase): } mock_requests.patch.return_value = self.mock_response retval = self.session_manager.update('d454beec-1f3c-4d11-aa1a-404116a40502', {'status': 'bamboozled'}) - self.assertEqual(retval, 12) + self.assertEqual(12, retval) @patch('freezer.apiclient.sessions.requests') def test_update_raise_ApiClientException_when_api_return_error_code(self, mock_requests): @@ -178,7 +178,7 @@ class TestSessionManager(unittest.TestCase): endpoint = '{0}{1}/action'.format(self.endpoint, session_id) data = {"start": {"current_tag": 23, "job_id": "jobqwerty1234"}} retval = self.session_manager.start_session(session_id, job_id, tag) - self.assertEqual(retval, {'result': 'success', 'session_tag': 24}) + self.assertEqual({'result': 'success', 'session_tag': 24}, retval) args = mock_requests.post.call_args[0] kwargs = mock_requests.post.call_args[1] @@ -205,7 +205,7 @@ class TestSessionManager(unittest.TestCase): endpoint = '{0}{1}/action'.format(self.endpoint, session_id) data = {"end": {"current_tag": 23, "job_id": "jobqwerty1234", "result": "fail"}} retval = self.session_manager.end_session(session_id, job_id, tag, 'fail') - self.assertEqual(retval, {'result': 'success', 'session_tag': 24}) + self.assertEqual({'result': 'success', 'session_tag': 24}, retval) args = mock_requests.post.call_args[0] kwargs = mock_requests.post.call_args[1] diff --git a/tests/test_scheduler_daemon.py b/tests/test_scheduler_daemon.py index f5dbc32d..2c103228 100644 --- a/tests/test_scheduler_daemon.py +++ b/tests/test_scheduler_daemon.py @@ -26,13 +26,13 @@ class TestLogging(unittest.TestCase): @patch('freezer.scheduler.daemon.logging') def test_setup_logging_default(self, mock_logging): res = daemon.setup_logging(None) - self.assertEqual(res, '/var/log/freezer-scheduler.log') + self.assertEqual('/var/log/freezer-scheduler.log', res) @patch('freezer.scheduler.daemon.create_dir') @patch('freezer.scheduler.daemon.logging') def test_setup_logging_userdefined(self, mock_logging, mock_createdir): res = daemon.setup_logging('mylogfile') - self.assertEqual(res, 'mylogfile') + self.assertEqual('mylogfile', res) class TestNoDaemon(unittest.TestCase): @@ -107,8 +107,8 @@ class TestDaemon(unittest.TestCase): def test_signal_map_handlers(self): signal_map = self.daemon.signal_map - self.assertEqual(signal_map[signal.SIGTERM], self.daemon.handle_program_exit) - self.assertEqual(signal_map[signal.SIGHUP], self.daemon.handle_reload) + self.assertEqual(self.daemon.handle_program_exit, signal_map[signal.SIGTERM]) + self.assertEqual(self.daemon.handle_reload, signal_map[signal.SIGHUP]) @patch('freezer.scheduler.daemon.gettempdir') @patch('freezer.scheduler.daemon.os.path.expanduser')