tests: fix unit tests broken by dependency drift (#430)

tseaver · web-flow · commit 2e70a582f3b3 · 2021-05-05T14:34:21.000-07:00
* tests: fix 'TestClient.test_ctor_wo_project' Broken by googleapis/python-cloud-core#51 Closes #427 * chore(deps): pin googleapis-common-protos' FBO python2.7 Closes #429
diff --git a/setup.py b/setup.py
@@ -32,6 +32,7 @@
     "google-cloud-core >= 1.4.1, < 2.0dev",
     "google-resumable-media >= 1.2.0, < 2.0dev",
     "requests >= 2.18.0, < 3.0.0dev",
+    "googleapis-common-protos < 1.53.0; python_version<'3.0'",
 ]
 extras = {}
 
diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py
@@ -39,9 +39,12 @@
 _FAKE_CREDENTIALS = Credentials.from_service_account_info(_SERVICE_ACCOUNT_JSON)
 
 
-def _make_credentials():
+def _make_credentials(project=None):
     import google.auth.credentials
 
+    if project is not None:
+        return mock.Mock(spec=google.auth.credentials.Credentials, project_id=project)
+
     return mock.Mock(spec=google.auth.credentials.Credentials)
 
 
@@ -174,14 +177,9 @@ def test_ctor_wo_project(self):
         from google.cloud.storage._http import Connection
 
         PROJECT = "PROJECT"
-        credentials = _make_credentials()
+        credentials = _make_credentials(project=PROJECT)
 
-        ddp_patch = mock.patch(
-            "google.cloud.client._determine_default_project", return_value=PROJECT
-        )
-
-        with ddp_patch:
-            client = self._make_one(credentials=credentials)
+        client = self._make_one(credentials=credentials)
 
         self.assertEqual(client.project, PROJECT)
         self.assertIsInstance(client._connection, Connection)

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`"google-cloud-core >= 1.4.1, < 2.0dev",`
`33`	`33`	`"google-resumable-media >= 1.2.0, < 2.0dev",`
`34`	`34`	`"requests >= 2.18.0, < 3.0.0dev",`
	`35`	`+ "googleapis-common-protos < 1.53.0; python_version<'3.0'",`
`35`	`36`	`]`
`36`	`37`	`extras = {}`
`37`	`38`