Skip to content

Commit 73872c1

Browse files
committed
fix to support py3 test verification
1 parent 16b7733 commit 73872c1

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

tests/test_user_mgt.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@
2525
from firebase_admin import _user_import
2626
from firebase_admin import _user_mgt
2727
from tests import testutils
28-
from urllib3.util import parse_url
29-
from requests.compat import urlencode
28+
29+
try:
30+
from urllib.parse import urlsplit, parse_qsl
31+
except ImportError:
32+
from urlparse import urlsplit, parse_qsl
3033

3134

3235
INVALID_STRINGS = [None, '', 0, 1, True, False, list(), tuple(), dict()]
@@ -521,7 +524,7 @@ def test_list_multiple_pages(self, user_mgt_app):
521524
assert page.next_page_token == ''
522525
assert page.has_next_page is False
523526
assert page.get_next_page() is None
524-
self._check_rpc_calls(recorder, {'maxResults': 1000, 'nextPageToken': 'token'})
527+
self._check_rpc_calls(recorder, {'maxResults': '1000', 'nextPageToken': 'token'})
525528

526529
def test_list_users_paged_iteration(self, user_mgt_app):
527530
# Page 1
@@ -547,7 +550,7 @@ def test_list_users_paged_iteration(self, user_mgt_app):
547550
assert user.uid == 'user4'
548551
with pytest.raises(StopIteration):
549552
next(iterator)
550-
self._check_rpc_calls(recorder, {'maxResults': 1000, 'nextPageToken': 'token'})
553+
self._check_rpc_calls(recorder, {'maxResults': '1000', 'nextPageToken': 'token'})
551554

552555
def test_list_users_iterator_state(self, user_mgt_app):
553556
response = {
@@ -600,13 +603,13 @@ def test_list_users_with_max_results(self, user_mgt_app):
600603
_, recorder = _instrument_user_manager(user_mgt_app, 200, MOCK_LIST_USERS_RESPONSE)
601604
page = auth.list_users(max_results=500, app=user_mgt_app)
602605
self._check_page(page)
603-
self._check_rpc_calls(recorder, {'maxResults' : 500})
606+
self._check_rpc_calls(recorder, {'maxResults' : '500'})
604607

605608
def test_list_users_with_all_args(self, user_mgt_app):
606609
_, recorder = _instrument_user_manager(user_mgt_app, 200, MOCK_LIST_USERS_RESPONSE)
607610
page = auth.list_users(page_token='foo', max_results=500, app=user_mgt_app)
608611
self._check_page(page)
609-
self._check_rpc_calls(recorder, {'nextPageToken' : 'foo', 'maxResults' : 500})
612+
self._check_rpc_calls(recorder, {'nextPageToken' : 'foo', 'maxResults' : '500'})
610613

611614
def test_list_users_error(self, user_mgt_app):
612615
_instrument_user_manager(user_mgt_app, 500, '{"error":"test"}')
@@ -628,10 +631,10 @@ def _check_page(self, page):
628631

629632
def _check_rpc_calls(self, recorder, expected=None):
630633
if expected is None:
631-
expected = {'maxResults' : 1000}
634+
expected = {'maxResults' : '1000'}
632635
assert len(recorder) == 1
633-
request = parse_url(recorder[0].url).query
634-
assert request == urlencode(query=expected)
636+
request = dict(parse_qsl(urlsplit(recorder[0].url).query))
637+
assert request == expected
635638

636639

637640
class TestUserProvider(object):

0 commit comments

Comments
 (0)