diff --git a/freezerclient/tests/unit/test_exceptions.py b/freezerclient/tests/unit/test_exceptions.py index c050f51..e6c9c04 100644 --- a/freezerclient/tests/unit/test_exceptions.py +++ b/freezerclient/tests/unit/test_exceptions.py @@ -22,4 +22,4 @@ class TestApiClientException(unittest.TestCase): def test_get_message_from_response_string(self): e = exceptions.ApiClientException('some error message') - self.assertEquals(str(e), 'some error message') + self.assertEqual(str(e), 'some error message') diff --git a/freezerclient/tests/unit/v1/test_client.py b/freezerclient/tests/unit/v1/test_client.py index bafff63..252eaee 100644 --- a/freezerclient/tests/unit/v1/test_client.py +++ b/freezerclient/tests/unit/v1/test_client.py @@ -31,22 +31,22 @@ class TestSupportFunctions(unittest.TestCase): def test_guess_auth_version_explicit_3(self): mock_opts = Mock() mock_opts.os_identity_api_version = '3' - self.assertEquals(client.guess_auth_version(mock_opts), '3') + self.assertEqual(client.guess_auth_version(mock_opts), '3') def test_guess_auth_version_explicit_2(self): mock_opts = Mock() mock_opts.os_identity_api_version = '2.0' - self.assertEquals(client.guess_auth_version(mock_opts), '2.0') + self.assertEqual(client.guess_auth_version(mock_opts), '2.0') def test_guess_auth_version_implicit_3(self): mock_opts = Mock() mock_opts.os_auth_url = 'http://whatever/v3' - self.assertEquals(client.guess_auth_version(mock_opts), '3') + self.assertEqual(client.guess_auth_version(mock_opts), '3') def test_guess_auth_version_implicit_2(self): mock_opts = Mock() mock_opts.os_auth_url = 'http://whatever/v2.0' - self.assertEquals(client.guess_auth_version(mock_opts), '2.0') + self.assertEqual(client.guess_auth_version(mock_opts), '2.0') @patch('freezerclient.v1.client.v3') @patch('freezerclient.v1.client.v2') @@ -136,7 +136,7 @@ class TestClientMock(unittest.TestCase): c = client.Client(session=mock_session, endpoint='justtest', auth_url='blabla') self.assertIsInstance(c, client.Client) - self.assertEquals(c.auth_token, 'antaniX2') + self.assertEqual(c.auth_token, 'antaniX2') @patch('freezerclient.v1.client.socket') @patch('freezerclient.v1.client.ksc_session') @@ -148,4 +148,4 @@ class TestClientMock(unittest.TestCase): c = client.Client(session=mock_session, endpoint='justtest', auth_url='blabla') self.assertIsInstance(c, client.Client) - self.assertEquals(c.client_id, 'H2O_parmenide') + self.assertEqual(c.client_id, 'H2O_parmenide') diff --git a/freezerclient/tests/unit/v1/test_client_jobs.py b/freezerclient/tests/unit/v1/test_client_jobs.py index 3b24d1f..519d0b5 100644 --- a/freezerclient/tests/unit/v1/test_client_jobs.py +++ b/freezerclient/tests/unit/v1/test_client_jobs.py @@ -178,9 +178,9 @@ class TestJobManager(unittest.TestCase): args = mock_requests.post.call_args[0] kwargs = mock_requests.post.call_args[1] - self.assertEquals(endpoint, args[0]) - self.assertEquals(data, json.loads(kwargs['data'])) - self.assertEquals(self.headers, kwargs['headers']) + self.assertEqual(endpoint, args[0]) + self.assertEqual(data, json.loads(kwargs['data'])) + self.assertEqual(self.headers, kwargs['headers']) @patch('freezerclient.v1.managers.jobs.requests') def test_start_job_raise_ApiClientException_when_api_return_error_code(self, mock_requests): @@ -205,9 +205,9 @@ class TestJobManager(unittest.TestCase): args = mock_requests.post.call_args[0] kwargs = mock_requests.post.call_args[1] - self.assertEquals(endpoint, args[0]) - self.assertEquals(data, json.loads(kwargs['data'])) - self.assertEquals(self.headers, kwargs['headers']) + self.assertEqual(endpoint, args[0]) + self.assertEqual(data, json.loads(kwargs['data'])) + self.assertEqual(self.headers, kwargs['headers']) @patch('freezerclient.v1.managers.jobs.requests') def test_stop_job_raise_ApiClientException_when_api_return_error_code(self, mock_requests): @@ -232,9 +232,9 @@ class TestJobManager(unittest.TestCase): args = mock_requests.post.call_args[0] kwargs = mock_requests.post.call_args[1] - self.assertEquals(endpoint, args[0]) - self.assertEquals(data, json.loads(kwargs['data'])) - self.assertEquals(self.headers, kwargs['headers']) + self.assertEqual(endpoint, args[0]) + self.assertEqual(data, json.loads(kwargs['data'])) + self.assertEqual(self.headers, kwargs['headers']) @patch('freezerclient.v1.managers.jobs.requests') def test_abort_job_raise_ApiClientException_when_api_return_error_code(self, mock_requests): diff --git a/freezerclient/tests/unit/v1/test_client_sessions.py b/freezerclient/tests/unit/v1/test_client_sessions.py index 0902611..977da91 100644 --- a/freezerclient/tests/unit/v1/test_client_sessions.py +++ b/freezerclient/tests/unit/v1/test_client_sessions.py @@ -184,9 +184,9 @@ class TestSessionManager(unittest.TestCase): args = mock_requests.post.call_args[0] kwargs = mock_requests.post.call_args[1] - self.assertEquals(endpoint, args[0]) - self.assertEquals(data, json.loads(kwargs['data'])) - self.assertEquals(self.headers, kwargs['headers']) + self.assertEqual(endpoint, args[0]) + self.assertEqual(data, json.loads(kwargs['data'])) + self.assertEqual(self.headers, kwargs['headers']) @patch('freezerclient.v1.managers.sessions.requests') def test_start_session_raise_ApiClientException_when_api_return_error_code(self, mock_requests): @@ -211,9 +211,9 @@ class TestSessionManager(unittest.TestCase): args = mock_requests.post.call_args[0] kwargs = mock_requests.post.call_args[1] - self.assertEquals(endpoint, args[0]) - self.assertEquals(data, json.loads(kwargs['data'])) - self.assertEquals(self.headers, kwargs['headers']) + self.assertEqual(endpoint, args[0]) + self.assertEqual(data, json.loads(kwargs['data'])) + self.assertEqual(self.headers, kwargs['headers']) @patch('freezerclient.v1.managers.sessions.requests') def test_end_session_raise_ApiClientException_when_api_return_error_code(self, mock_requests):