Skip to content

Commit c811dac

Browse files
tswasttseaver
authored and
cojenco
committed
test: update tests to support latest google-cloud-core (googleapis#277)
`google-cloud-core` version 1.4.2 populates `prettyPrint=false` by default. Update the connection tests to expect a value for `prettyPrint`. Co-authored-by: Tres Seaver <tseaver@palladion.com>
1 parent bd9de3a commit c811dac

2 files changed

Lines changed: 300 additions & 290 deletions

File tree

‎tests/unit/test__http.py‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,33 @@ def test_extra_headers(self):
6060
)
6161

6262
def test_build_api_url_no_extra_query_params(self):
63+
from six.moves.urllib.parse import parse_qsl
64+
from six.moves.urllib.parse import urlsplit
65+
6366
conn = self._make_one(object())
64-
URI = "/".join([conn.DEFAULT_API_ENDPOINT, "storage", conn.API_VERSION, "foo"])
65-
self.assertEqual(conn.build_api_url("/foo"), URI)
67+
uri = conn.build_api_url("/foo")
68+
scheme, netloc, path, qs, _ = urlsplit(uri)
69+
self.assertEqual("%s://%s" % (scheme, netloc), conn.API_BASE_URL)
70+
self.assertEqual(path, "/".join(["", "storage", conn.API_VERSION, "foo"]))
71+
parms = dict(parse_qsl(qs))
72+
pretty_print = parms.pop("prettyPrint", "false")
73+
self.assertEqual(pretty_print, "false")
74+
self.assertEqual(parms, {})
6675

6776
def test_build_api_url_w_custom_endpoint(self):
68-
custom_endpoint = "https://foo-googleapis.com"
77+
from six.moves.urllib.parse import parse_qsl
78+
from six.moves.urllib.parse import urlsplit
79+
80+
custom_endpoint = "https://foo-storage.googleapis.com"
6981
conn = self._make_one(object(), api_endpoint=custom_endpoint)
70-
URI = "/".join([custom_endpoint, "storage", conn.API_VERSION, "foo"])
71-
self.assertEqual(conn.build_api_url("/foo"), URI)
82+
uri = conn.build_api_url("/foo")
83+
scheme, netloc, path, qs, _ = urlsplit(uri)
84+
self.assertEqual("%s://%s" % (scheme, netloc), custom_endpoint)
85+
self.assertEqual(path, "/".join(["", "storage", conn.API_VERSION, "foo"]))
86+
parms = dict(parse_qsl(qs))
87+
pretty_print = parms.pop("prettyPrint", "false")
88+
self.assertEqual(pretty_print, "false")
89+
self.assertEqual(parms, {})
7290

7391
def test_build_api_url_w_extra_query_params(self):
7492
from six.moves.urllib.parse import parse_qsl

0 commit comments

Comments
 (0)