From ff106c113b0dca93ddf82fdaf271e33db65b8244 Mon Sep 17 00:00:00 2001 From: Peter Lamut Date: Fri, 10 Jan 2020 10:38:29 +0000 Subject: [PATCH 1/3] Adjust request params assertion in test (timeout) --- logging/tests/unit/test__http.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/logging/tests/unit/test__http.py b/logging/tests/unit/test__http.py index 30fef253af0c..4ffc1cfebd1c 100644 --- a/logging/tests/unit/test__http.py +++ b/logging/tests/unit/test__http.py @@ -72,7 +72,11 @@ def test_extra_headers(self): } expected_uri = conn.build_api_url("/rainbow") http.request.assert_called_once_with( - data=req_data, headers=expected_headers, method="GET", url=expected_uri + data=req_data, + headers=expected_headers, + method="GET", + url=expected_uri, + timeout=None, ) From 2d7798df9a1ae9f167ba95cceee6de8a3049eebe Mon Sep 17 00:00:00 2001 From: Peter Lamut Date: Fri, 10 Jan 2020 10:43:19 +0000 Subject: [PATCH 2/3] Update version pins for core dependencies Version bumps are needed, as timeouts were introduced to API core. --- logging/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logging/setup.py b/logging/setup.py index 00c9cb388a12..fd71ab274b7d 100644 --- a/logging/setup.py +++ b/logging/setup.py @@ -29,8 +29,8 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ - "google-api-core[grpc] >= 1.14.0, < 2.0.0dev", - "google-cloud-core >= 1.0.3, < 2.0dev", + "google-api-core[grpc] >= 1.15.0, < 2.0.0dev", + "google-cloud-core >= 1.1.0, < 2.0dev", ] extras = { } From f42692cca8dbf00cc1c59d67bf53a2db779cc239 Mon Sep 17 00:00:00 2001 From: Peter Lamut Date: Fri, 10 Jan 2020 11:46:51 +0000 Subject: [PATCH 3/3] Adjust assertion in system test An empty zone label that was missing is added. --- logging/tests/system/test_system.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/logging/tests/system/test_system.py b/logging/tests/system/test_system.py index 8e2d694081a1..ea51aa8fd729 100644 --- a/logging/tests/system/test_system.py +++ b/logging/tests/system/test_system.py @@ -179,7 +179,8 @@ def test_log_text_with_resource(self): logger = Config.CLIENT.logger(self._logger_name("log_text_res")) now = datetime.datetime.utcnow() resource = Resource( - type="gae_app", labels={"module_id": "default", "version_id": "test"} + type="gae_app", + labels={"module_id": "default", "version_id": "test", "zone": ""}, ) self.to_delete.append(logger)