From ac1139923dc521292e4e0166f518467e363638e3 Mon Sep 17 00:00:00 2001 From: Peter Lamut Date: Fri, 10 Jan 2020 15:38:38 +0000 Subject: [PATCH 1/2] Adjust request params assertion in test (timeout) --- resource_manager/tests/unit/test__http.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resource_manager/tests/unit/test__http.py b/resource_manager/tests/unit/test__http.py index 619845cb3126..291dab1036cb 100644 --- a/resource_manager/tests/unit/test__http.py +++ b/resource_manager/tests/unit/test__http.py @@ -74,5 +74,9 @@ 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 c27c0c44e52da97a505f1e71387d2ed2b162e89e Mon Sep 17 00:00:00 2001 From: Peter Lamut Date: Fri, 10 Jan 2020 15:40:15 +0000 Subject: [PATCH 2/2] Bump pin for core dependency This is to assure that Connection object from core supports timeouts. --- resource_manager/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource_manager/setup.py b/resource_manager/setup.py index 6cc22b82e864..f207d743e9e5 100644 --- a/resource_manager/setup.py +++ b/resource_manager/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - "google-cloud-core >= 1.0.3, < 2.0dev", + "google-cloud-core >= 1.1.0, < 2.0dev", ] extras = { }