Removing mock.Mock() in error reporting.

This actually required a much more comprehensive set of
unit test changes than expected.

Also incorporated a change from googleapis#3057 (which slipped through
due to overly broad mocks).

Author: dhermes

error_reporting/google/cloud/error_reporting/_gax.py

@@ -36,7 +36,7 @@ def make_report_error_api(client):
     :returns: An Error Reporting API instance.
     """
     channel = make_secure_channel(
-        client._connection.credentials,
+        client._credentials,
         DEFAULT_USER_AGENT,
         report_errors_service_client.ReportErrorsServiceClient.SERVICE_ADDRESS)
     gax_client = report_errors_service_client.ReportErrorsServiceClient(

error_reporting/unit_tests/test__gax.py

@@ -28,7 +28,11 @@ def test_make_report_error_api(self):
         from google.cloud.error_reporting import __version__
         from google.cloud.error_reporting._gax import make_report_error_api
 
-        client = mock.Mock()
+        client = mock.Mock(
+            _credentials=mock.sentinel.credentials,
+            project='prahj-ekt',
+            spec=['project', '_credentials'],
+        )
 
         # Mock out the constructor for the GAPIC client.
         ServiceClient = report_errors_service_client.ReportErrorsServiceClient
@@ -55,24 +59,34 @@ class Test_ErrorReportingGaxApi(unittest.TestCase):
 
     PROJECT = 'PROJECT'
 
-    def _call_fut(self, gax_api, project):
+    def _make_one(self, gax_api, project):
         from google.cloud.error_reporting._gax import _ErrorReportingGaxApi
 
         return _ErrorReportingGaxApi(gax_api, project)
 
     def test_constructor(self):
-        gax_api = mock.Mock()
-        gax_client_wrapper = self._call_fut(gax_api, self.PROJECT)
+        gax_api = mock.Mock(spec=[])
+        gax_client_wrapper = self._make_one(gax_api, self.PROJECT)
 
         self.assertEqual(gax_client_wrapper._project, self.PROJECT)
         self.assertEqual(gax_client_wrapper._gax_api, gax_api)
 
-    @mock.patch("google.cloud.error_reporting._gax.ParseDict")
-    def test_report_error_event(self, _):
-        gax_api = mock.Mock()
-        gax_client_wrapper = self._call_fut(gax_api, self.PROJECT)
-
-        mock_error_report = mock.Mock()
-        gax_client_wrapper.report_error_event(mock_error_report)
-        self.assertTrue(gax_api.report_error_event.called_with,
-                        mock_error_report)
+    def test_report_error_event(self):
+        from google.cloud.proto.devtools.clouderrorreporting.v1beta1 import (
+            report_errors_service_pb2)
+
+        gax_api = mock.Mock(spec=['project_path', 'report_error_event'])
+        gax_client_wrapper = self._make_one(gax_api, self.PROJECT)
+
+        error_report = {
+            'message': 'The cabs are here.',
+        }
+        gax_client_wrapper.report_error_event(error_report)
+
+        gax_api.project_path.assert_called_once_with(self.PROJECT)
+        project_name = gax_api.project_path.return_value
+        error_pb = report_errors_service_pb2.ReportedErrorEvent(
+            message=error_report['message'],
+        )
+        gax_api.report_error_event.assert_called_once_with(
+            project_name, error_pb)

error_reporting/unit_tests/test__logging.py

@@ -26,28 +26,36 @@ def _make_credentials():
 class Test_ErrorReportingLoggingAPI(unittest.TestCase):
 
     PROJECT = 'PROJECT'
-    SERVICE = 'SERVICE'
-    VERSION = 'myversion'
 
-    def _call_fut(self, project, credentials):
+    def _make_one(self, project, credentials):
         from google.cloud.error_reporting._logging import (
             _ErrorReportingLoggingAPI)
 
         return _ErrorReportingLoggingAPI(project, credentials)
 
     def test_constructor(self):
         credentials = _make_credentials()
-        logger_client = self._call_fut(self.PROJECT, credentials)
+        logging_api = self._make_one(self.PROJECT, credentials)
 
-        self.assertEqual(logger_client.logging_client._connection.credentials,
+        self.assertEqual(logging_api.logging_client._connection.credentials,
                          credentials)
-        self.assertEqual(logger_client.logging_client.project, self.PROJECT)
+        self.assertEqual(logging_api.logging_client.project, self.PROJECT)
 
-    @mock.patch('google.cloud.logging.client')
-    def test_report_error_event(self, _):
+    @mock.patch('google.cloud.logging.client.Client')
+    def test_report_error_event(self, mocked_cls):
         credentials = _make_credentials()
-        logger_client = self._call_fut(self.PROJECT, credentials)
-        payload = mock.Mock()
-        logger_client.report_error_event(payload)
-        logger_mock = mock.Mock()
-        self.assertTrue(logger_mock.log_struct.called_with, payload)
+        logging_api = self._make_one(self.PROJECT, credentials)
+        mocked_cls.assert_called_once_with(self.PROJECT, credentials, None)
+        self.assertIs(logging_api.logging_client, mocked_cls.return_value)
+
+        logger = mock.Mock(spec=['log_struct'])
+        logging_api.logging_client.logger.return_value = logger
+
+        # Actually make the API call.
+        error_report = {
+            'message': 'The cabs are here.',
+        }
+        logging_api.report_error_event(error_report)
+
+        # Check the mocks.
+        logger.log_struct.assert_called_once_with(error_report)

error_reporting/unit_tests/test_client.py

@@ -26,6 +26,10 @@ def _make_credentials():
 
 class TestClient(unittest.TestCase):
 
+    PROJECT = 'PROJECT'
+    SERVICE = 'SERVICE'
+    VERSION = 'myversion'
+
     @staticmethod
     def _get_target_class():
         from google.cloud.error_reporting.client import Client
@@ -37,16 +41,20 @@ def _getHttpContext(self):
 
         return HTTPContext
 
+    def _get_report_payload(self, client):
+        self.assertEqual(client.report_error_event.call_count, 1)
+        call = client.report_error_event.mock_calls[0]
+        _, positional, kwargs = call
+        self.assertEqual(kwargs, {})
+        self.assertEqual(len(positional), 1)
+        return positional[0]
+
     def _make_one(self, *args, **kw):
         return self._get_target_class()(*args, **kw)
 
     def _makeHTTP(self, *args, **kw):
         return self._getHttpContext()(*args, **kw)
 
-    PROJECT = 'PROJECT'
-    SERVICE = 'SERVICE'
-    VERSION = 'myversion'
-
     @mock.patch(
         'google.cloud.error_reporting.client._determine_default_project')
     def test_ctor_default(self, _):
@@ -120,15 +128,15 @@ def test_report_exception_with_service_version_in_constructor(
         http_context = self._makeHTTP(method="GET", response_status_code=500)
         USER = "user@gmail.com"
 
-        client = mock.Mock()
+        client = mock.Mock(spec=['report_error_event'])
         make_client.return_value = client
 
         try:
             raise NameError
         except NameError:
             target.report_exception(http_context=http_context, user=USER)
 
-        payload = client.report_error_event.call_args[0][0]
+        payload = self._get_report_payload(client)
         self.assertEqual(payload['serviceContext'], {
             'service': SERVICE,
             'version': VERSION
@@ -149,13 +157,13 @@ def test_report(self, make_client):
         target = self._make_one(project=self.PROJECT,
                                 credentials=CREDENTIALS)
 
-        client = mock.Mock()
+        client = mock.Mock(spec=['report_error_event'])
         make_client.return_value = client
 
         MESSAGE = 'this is an error'
         target.report(MESSAGE)
 
-        payload = client.report_error_event.call_args[0][0]
+        payload = self._get_report_payload(client)
 
         self.assertEqual(payload['message'], MESSAGE)
         report_location = payload['context']['reportLocation']