Content-Length: 4543 | pFad | http://github.com/googleapis/python-runtimeconfig/pull/23.patch

thub.com From 5055e85a28ed39b40df8832eda102b5a4ce0f734 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Tue, 22 Sep 2020 14:47:11 -0500 Subject: [PATCH 1/3] test: update tests to support latest google-cloud-core `google-cloud-core` version 1.4.2 populates `prettyPrint=false` by default. Update the connection tests to expect a value for `prettyPrint`. --- setup.py | 2 +- tests/unit/test__http.py | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 5c35d0c..1cb5c68 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ # 'Development Status :: 4 - Beta' # 'Development Status :: 5 - Production/Stable' release_status = "Development Status :: 4 - Beta" -dependencies = ["google-cloud-core >= 1.1.0, < 2.0dev"] +dependencies = ["google-cloud-core == 1.4.2rc1"] extras = {} diff --git a/tests/unit/test__http.py b/tests/unit/test__http.py index f965f19..5672119 100644 --- a/tests/unit/test__http.py +++ b/tests/unit/test__http.py @@ -32,11 +32,46 @@ def test_default_url(self): conn = self._make_one(client) self.assertIs(conn._client, client) + def test_build_api_url_no_extra_query_params(self): + from six.moves.urllib.parse import parse_qsl + from six.moves.urllib.parse import urlsplit + + conn = self._make_one(object()) + uri = conn.build_api_url("/foo") + scheme, netloc, path, qs, _ = urlsplit(uri) + self.assertEqual("%s://%s" % (scheme, netloc), conn.API_BASE_URL) + self.assertEqual(path, "/".join(["", conn.API_VERSION, "foo"])) + parms = dict(parse_qsl(qs)) + pretty_print = parms.pop("prettyPrint", "false") + self.assertEqual(pretty_print, "false") + self.assertEqual(parms, {}) + def test_build_api_url_w_custom_endpoint(self): + from six.moves.urllib.parse import parse_qsl + from six.moves.urllib.parse import urlsplit + custom_endpoint = "https://foo-runtimeconfig.googleapis.com" conn = self._make_one(object(), api_endpoint=custom_endpoint) - URI = "/".join([custom_endpoint, conn.API_VERSION, "foo"]) - self.assertEqual(conn.build_api_url("/foo"), URI) + uri = conn.build_api_url("/foo") + scheme, netloc, path, qs, _ = urlsplit(uri) + self.assertEqual("%s://%s" % (scheme, netloc), custom_endpoint) + self.assertEqual(path, "/".join(["", conn.API_VERSION, "foo"])) + parms = dict(parse_qsl(qs)) + pretty_print = parms.pop("prettyPrint", "false") + self.assertEqual(pretty_print, "false") + self.assertEqual(parms, {}) + + def test_build_api_url_w_extra_query_params(self): + from six.moves.urllib.parse import parse_qsl + from six.moves.urllib.parse import urlsplit + + conn = self._make_one(object()) + uri = conn.build_api_url("/foo", {"bar": "baz"}) + scheme, netloc, path, qs, _ = urlsplit(uri) + self.assertEqual("%s://%s" % (scheme, netloc), conn.API_BASE_URL) + self.assertEqual(path, "/".join(["", conn.API_VERSION, "foo"])) + parms = dict(parse_qsl(qs)) + self.assertEqual(parms["bar"], "baz") def test_extra_headers(self): import requests From 5c6eb52eb16857ed20f85043877373019531e9de Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Tue, 29 Sep 2020 14:50:02 -0500 Subject: [PATCH 2/3] update to rc2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1cb5c68..52b85b6 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ # 'Development Status :: 4 - Beta' # 'Development Status :: 5 - Production/Stable' release_status = "Development Status :: 4 - Beta" -dependencies = ["google-cloud-core == 1.4.2rc1"] +dependencies = ["google-cloud-core == 1.4.2rc2"] extras = {} From 1ffd8ccb61ecd833d2232d91181d7f9f49687ce0 Mon Sep 17 00:00:00 2001 From: Tim Swast Date: Tue, 29 Sep 2020 15:38:13 -0500 Subject: [PATCH 3/3] revert changes to setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 52b85b6..5c35d0c 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ # 'Development Status :: 4 - Beta' # 'Development Status :: 5 - Production/Stable' release_status = "Development Status :: 4 - Beta" -dependencies = ["google-cloud-core == 1.4.2rc2"] +dependencies = ["google-cloud-core >= 1.1.0, < 2.0dev"] extras = {}

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!