Skip to content

Commit ac6be4e

Browse files
authored
test: update tests to support latest google-cloud-core (#31)
`google-cloud-core` version 1.4.2 populates `prettyPrint=false` by default. Update the connection tests to expect a value for `prettyPrint`.
1 parent ec0cd1d commit ac6be4e

1 file changed

Lines changed: 22 additions & 4 deletions

File tree

packages/google-cloud-resource-manager/tests/unit/test__http.py

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,33 @@ def _make_one(self, *args, **kw):
2828
return self._get_target_class()(*args, **kw)
2929

3030
def test_build_api_url_no_extra_query_params(self):
31+
from six.moves.urllib.parse import parse_qsl
32+
from six.moves.urllib.parse import urlsplit
33+
3134
conn = self._make_one(object())
32-
URI = "/".join([conn.DEFAULT_API_ENDPOINT, conn.API_VERSION, "foo"])
33-
self.assertEqual(conn.build_api_url("/foo"), URI)
35+
uri = conn.build_api_url("/foo")
36+
scheme, netloc, path, qs, _ = urlsplit(uri)
37+
self.assertEqual("%s://%s" % (scheme, netloc), conn.API_BASE_URL)
38+
self.assertEqual(path, "/".join(["", conn.API_VERSION, "foo"]))
39+
parms = dict(parse_qsl(qs))
40+
pretty_print = parms.pop("prettyPrint", "false")
41+
self.assertEqual(pretty_print, "false")
42+
self.assertEqual(parms, {})
3443

3544
def test_build_api_url_w_custom_endpoint(self):
45+
from six.moves.urllib.parse import parse_qsl
46+
from six.moves.urllib.parse import urlsplit
47+
3648
custom_endpoint = "https://foo-cloudresourcemanager.googleapis.com"
3749
conn = self._make_one(object(), api_endpoint=custom_endpoint)
38-
URI = "/".join([custom_endpoint, conn.API_VERSION, "foo"])
39-
self.assertEqual(conn.build_api_url("/foo"), URI)
50+
uri = conn.build_api_url("/foo")
51+
scheme, netloc, path, qs, _ = urlsplit(uri)
52+
self.assertEqual("%s://%s" % (scheme, netloc), custom_endpoint)
53+
self.assertEqual(path, "/".join(["", conn.API_VERSION, "foo"]))
54+
parms = dict(parse_qsl(qs))
55+
pretty_print = parms.pop("prettyPrint", "false")
56+
self.assertEqual(pretty_print, "false")
57+
self.assertEqual(parms, {})
4058

4159
def test_build_api_url_w_extra_query_params(self):
4260
from six.moves.urllib.parse import parse_qsl

0 commit comments

Comments
 (0)