From 88c709af281d333e932f90f98816c8a8dd7fe493 Mon Sep 17 00:00:00 2001 From: Thomas Schultz Date: Mon, 20 Feb 2017 13:36:32 -0500 Subject: [PATCH] Rename deprecated assertEquals to assertEqual. --- error_reporting/unit_tests/test_client.py | 22 +++++++++---------- .../transports/test_background_thread.py | 4 ++-- monitoring/unit_tests/test_metric.py | 2 +- monitoring/unit_tests/test_resource.py | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/error_reporting/unit_tests/test_client.py b/error_reporting/unit_tests/test_client.py index 60b5f4df61d2..a1f8ebeb0d03 100644 --- a/error_reporting/unit_tests/test_client.py +++ b/error_reporting/unit_tests/test_client.py @@ -52,8 +52,8 @@ def _makeHTTP(self, *args, **kw): def test_ctor_default(self, _): CREDENTIALS = _make_credentials() target = self._make_one(credentials=CREDENTIALS) - self.assertEquals(target.service, target.DEFAULT_SERVICE) - self.assertEquals(target.version, None) + self.assertEqual(target.service, target.DEFAULT_SERVICE) + self.assertEqual(target.version, None) def test_ctor_params(self): CREDENTIALS = _make_credentials() @@ -61,8 +61,8 @@ def test_ctor_params(self): credentials=CREDENTIALS, service=self.SERVICE, version=self.VERSION) - self.assertEquals(target.service, self.SERVICE) - self.assertEquals(target.version, self.VERSION) + self.assertEqual(target.service, self.SERVICE) + self.assertEqual(target.version, self.VERSION) def test_report_exception_with_gax(self): CREDENTIALS = _make_credentials() @@ -77,7 +77,7 @@ def test_report_exception_with_gax(self): except NameError: target.report_exception() payload = make_api.return_value.report_error_event.call_args[0][0] - self.assertEquals(payload['serviceContext'], { + self.assertEqual(payload['serviceContext'], { 'service': target.DEFAULT_SERVICE, }) self.assertIn('test_report', payload['message']) @@ -99,7 +99,7 @@ def test_report_exception_wo_gax(self): mock_report = _error_api.return_value.report_error_event payload = mock_report.call_args[0][0] - self.assertEquals(payload['serviceContext'], { + self.assertEqual(payload['serviceContext'], { 'service': target.DEFAULT_SERVICE, }) self.assertIn('test_report', payload['message']) @@ -129,7 +129,7 @@ def test_report_exception_with_service_version_in_constructor( target.report_exception(http_context=http_context, user=USER) payload = client.report_error_event.call_args[0][0] - self.assertEquals(payload['serviceContext'], { + self.assertEqual(payload['serviceContext'], { 'service': SERVICE, 'version': VERSION }) @@ -137,11 +137,11 @@ def test_report_exception_with_service_version_in_constructor( 'test_report_exception_with_service_version_in_constructor', payload['message']) self.assertIn('test_client.py', payload['message']) - self.assertEquals( + self.assertEqual( payload['context']['httpContext']['responseStatusCode'], 500) - self.assertEquals( + self.assertEqual( payload['context']['httpContext']['method'], 'GET') - self.assertEquals(payload['context']['user'], USER) + self.assertEqual(payload['context']['user'], USER) @mock.patch('google.cloud.error_reporting.client.make_report_error_api') def test_report(self, make_client): @@ -157,7 +157,7 @@ def test_report(self, make_client): payload = client.report_error_event.call_args[0][0] - self.assertEquals(payload['message'], MESSAGE) + self.assertEqual(payload['message'], MESSAGE) report_location = payload['context']['reportLocation'] self.assertIn('test_client.py', report_location['filePath']) self.assertEqual(report_location['functionName'], 'test_report') diff --git a/logging/unit_tests/handlers/transports/test_background_thread.py b/logging/unit_tests/handlers/transports/test_background_thread.py index 454f1d873de5..bcd54a8feb06 100644 --- a/logging/unit_tests/handlers/transports/test_background_thread.py +++ b/logging/unit_tests/handlers/transports/test_background_thread.py @@ -35,7 +35,7 @@ def test_ctor(self): client = _Client(self.PROJECT) NAME = 'python_logger' transport = self._make_one(client, NAME) - self.assertEquals(transport.worker.logger.name, NAME) + self.assertEqual(transport.worker.logger.name, NAME) def test_send(self): client = _Client(self.PROJECT) @@ -73,7 +73,7 @@ def test_ctor(self): NAME = 'python_logger' logger = _Logger(NAME) worker = self._make_one(logger) - self.assertEquals(worker.batch, logger._batch) + self.assertEqual(worker.batch, logger._batch) def test_run(self): NAME = 'python_logger' diff --git a/monitoring/unit_tests/test_metric.py b/monitoring/unit_tests/test_metric.py index aae718099260..a74992b1dca7 100644 --- a/monitoring/unit_tests/test_metric.py +++ b/monitoring/unit_tests/test_metric.py @@ -548,7 +548,7 @@ def test_to_dict(self): 'type': TYPE, 'labels': LABELS, } - self.assertEquals(metric._to_dict(), expected_dict) + self.assertEqual(metric._to_dict(), expected_dict) class _Connection(object): diff --git a/monitoring/unit_tests/test_resource.py b/monitoring/unit_tests/test_resource.py index eaaa3fe30feb..acb6d35e0018 100644 --- a/monitoring/unit_tests/test_resource.py +++ b/monitoring/unit_tests/test_resource.py @@ -331,7 +331,7 @@ def test_to_dict(self): 'type': TYPE, 'labels': LABELS, } - self.assertEquals(resource._to_dict(), expected_dict) + self.assertEqual(resource._to_dict(), expected_dict) class _Connection(object):