From 1e252e2fb4a67fee3713345a3dba67c99aac8e03 Mon Sep 17 00:00:00 2001 From: chalmer lowe Date: Wed, 15 Apr 2026 14:18:58 -0400 Subject: [PATCH 1/6] test(storage): isolate environment in client tests --- .../tests/unit/test_client.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/google-cloud-storage/tests/unit/test_client.py b/packages/google-cloud-storage/tests/unit/test_client.py index dac1742ce3ce..63066cf1b6fc 100644 --- a/packages/google-cloud-storage/tests/unit/test_client.py +++ b/packages/google-cloud-storage/tests/unit/test_client.py @@ -300,7 +300,8 @@ def test_ctor_wo_project(self): PROJECT = "PROJECT" credentials = _make_credentials(project=PROJECT) - client = self._make_one(credentials=credentials) + with mock.patch("os.environ", {}): + client = self._make_one(credentials=credentials) self.assertEqual(client.project, PROJECT) self.assertIsInstance(client._connection, Connection) @@ -368,10 +369,11 @@ def test_ctor_w_custom_endpoint_use_auth(self): def test_ctor_w_custom_endpoint_bypass_auth(self): custom_endpoint = "storage-example.p.googleapis.com" - client = self._make_one( - client_options={"api_endpoint": custom_endpoint}, - use_auth_w_custom_endpoint=False, - ) + with mock.patch("os.environ", {}): + client = self._make_one( + client_options={"api_endpoint": custom_endpoint}, + use_auth_w_custom_endpoint=False, + ) self.assertEqual(client._connection.API_BASE_URL, custom_endpoint) self.assertEqual(client.project, None) self.assertIsInstance(client._connection, Connection) @@ -381,9 +383,10 @@ def test_ctor_w_custom_endpoint_w_credentials(self): PROJECT = "PROJECT" custom_endpoint = "storage-example.p.googleapis.com" credentials = _make_credentials(project=PROJECT) - client = self._make_one( - credentials=credentials, client_options={"api_endpoint": custom_endpoint} - ) + with mock.patch("os.environ", {}): + client = self._make_one( + credentials=credentials, client_options={"api_endpoint": custom_endpoint} + ) self.assertEqual(client._connection.API_BASE_URL, custom_endpoint) self.assertEqual(client.project, PROJECT) self.assertIsInstance(client._connection, Connection) From 75b6d2a1e6d66444d0e42fbe2655c47181e359a9 Mon Sep 17 00:00:00 2001 From: chalmer lowe Date: Wed, 15 Apr 2026 14:27:59 -0400 Subject: [PATCH 2/6] chore: update linting --- packages/google-cloud-storage/tests/unit/test_client.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/google-cloud-storage/tests/unit/test_client.py b/packages/google-cloud-storage/tests/unit/test_client.py index 63066cf1b6fc..fd61812021e8 100644 --- a/packages/google-cloud-storage/tests/unit/test_client.py +++ b/packages/google-cloud-storage/tests/unit/test_client.py @@ -385,7 +385,8 @@ def test_ctor_w_custom_endpoint_w_credentials(self): credentials = _make_credentials(project=PROJECT) with mock.patch("os.environ", {}): client = self._make_one( - credentials=credentials, client_options={"api_endpoint": custom_endpoint} + credentials=credentials, + client_options={"api_endpoint": custom_endpoint}, ) self.assertEqual(client._connection.API_BASE_URL, custom_endpoint) self.assertEqual(client.project, PROJECT) From a6e4570692cd7b4f1570cbb9bf66e454547b9799 Mon Sep 17 00:00:00 2001 From: Chalmer Lowe Date: Thu, 16 Apr 2026 05:45:20 -0400 Subject: [PATCH 3/6] Update packages/google-cloud-storage/tests/unit/test_client.py Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- packages/google-cloud-storage/tests/unit/test_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google-cloud-storage/tests/unit/test_client.py b/packages/google-cloud-storage/tests/unit/test_client.py index fd61812021e8..48b8648de583 100644 --- a/packages/google-cloud-storage/tests/unit/test_client.py +++ b/packages/google-cloud-storage/tests/unit/test_client.py @@ -300,7 +300,7 @@ def test_ctor_wo_project(self): PROJECT = "PROJECT" credentials = _make_credentials(project=PROJECT) - with mock.patch("os.environ", {}): + with mock.patch.dict("os.environ", {}, clear=True): client = self._make_one(credentials=credentials) self.assertEqual(client.project, PROJECT) From 92b36010ea46545195d725d4a0d7da33f29e51a0 Mon Sep 17 00:00:00 2001 From: Chalmer Lowe Date: Thu, 16 Apr 2026 05:45:40 -0400 Subject: [PATCH 4/6] Update packages/google-cloud-storage/tests/unit/test_client.py Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- packages/google-cloud-storage/tests/unit/test_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/google-cloud-storage/tests/unit/test_client.py b/packages/google-cloud-storage/tests/unit/test_client.py index 48b8648de583..214fa647e54c 100644 --- a/packages/google-cloud-storage/tests/unit/test_client.py +++ b/packages/google-cloud-storage/tests/unit/test_client.py @@ -369,7 +369,7 @@ def test_ctor_w_custom_endpoint_use_auth(self): def test_ctor_w_custom_endpoint_bypass_auth(self): custom_endpoint = "storage-example.p.googleapis.com" - with mock.patch("os.environ", {}): + with mock.patch.dict("os.environ", {}, clear=True): client = self._make_one( client_options={"api_endpoint": custom_endpoint}, use_auth_w_custom_endpoint=False, From 0c622d7082d1fd99b58b56ccf230d104f1a6a9ea Mon Sep 17 00:00:00 2001 From: Chalmer Lowe Date: Thu, 16 Apr 2026 05:45:51 -0400 Subject: [PATCH 5/6] Update packages/google-cloud-storage/tests/unit/test_client.py Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- packages/google-cloud-storage/tests/unit/test_client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/google-cloud-storage/tests/unit/test_client.py b/packages/google-cloud-storage/tests/unit/test_client.py index 214fa647e54c..0cd1057b229a 100644 --- a/packages/google-cloud-storage/tests/unit/test_client.py +++ b/packages/google-cloud-storage/tests/unit/test_client.py @@ -384,9 +384,9 @@ def test_ctor_w_custom_endpoint_w_credentials(self): custom_endpoint = "storage-example.p.googleapis.com" credentials = _make_credentials(project=PROJECT) with mock.patch("os.environ", {}): + with mock.patch.dict("os.environ", {}, clear=True): client = self._make_one( - credentials=credentials, - client_options={"api_endpoint": custom_endpoint}, + credentials=credentials, client_options={"api_endpoint": custom_endpoint} ) self.assertEqual(client._connection.API_BASE_URL, custom_endpoint) self.assertEqual(client.project, PROJECT) From 20f43092f871dadf172f3c57bda3196068730632 Mon Sep 17 00:00:00 2001 From: chalmer lowe Date: Thu, 16 Apr 2026 06:21:54 -0400 Subject: [PATCH 6/6] test: removes unneeded line and applies linting --- packages/google-cloud-storage/tests/unit/test_client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/google-cloud-storage/tests/unit/test_client.py b/packages/google-cloud-storage/tests/unit/test_client.py index 0cd1057b229a..be6e7273e3b5 100644 --- a/packages/google-cloud-storage/tests/unit/test_client.py +++ b/packages/google-cloud-storage/tests/unit/test_client.py @@ -383,10 +383,10 @@ def test_ctor_w_custom_endpoint_w_credentials(self): PROJECT = "PROJECT" custom_endpoint = "storage-example.p.googleapis.com" credentials = _make_credentials(project=PROJECT) - with mock.patch("os.environ", {}): with mock.patch.dict("os.environ", {}, clear=True): client = self._make_one( - credentials=credentials, client_options={"api_endpoint": custom_endpoint} + credentials=credentials, + client_options={"api_endpoint": custom_endpoint}, ) self.assertEqual(client._connection.API_BASE_URL, custom_endpoint) self.assertEqual(client.project, PROJECT)