25
25
from firebase_admin import _user_import
26
26
from firebase_admin import _user_mgt
27
27
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
30
33
31
34
32
35
INVALID_STRINGS = [None , '' , 0 , 1 , True , False , list (), tuple (), dict ()]
@@ -521,7 +524,7 @@ def test_list_multiple_pages(self, user_mgt_app):
521
524
assert page .next_page_token == ''
522
525
assert page .has_next_page is False
523
526
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' })
525
528
526
529
def test_list_users_paged_iteration (self , user_mgt_app ):
527
530
# Page 1
@@ -547,7 +550,7 @@ def test_list_users_paged_iteration(self, user_mgt_app):
547
550
assert user .uid == 'user4'
548
551
with pytest .raises (StopIteration ):
549
552
next (iterator )
550
- self ._check_rpc_calls (recorder , {'maxResults' : 1000 , 'nextPageToken' : 'token' })
553
+ self ._check_rpc_calls (recorder , {'maxResults' : ' 1000' , 'nextPageToken' : 'token' })
551
554
552
555
def test_list_users_iterator_state (self , user_mgt_app ):
553
556
response = {
@@ -600,13 +603,13 @@ def test_list_users_with_max_results(self, user_mgt_app):
600
603
_ , recorder = _instrument_user_manager (user_mgt_app , 200 , MOCK_LIST_USERS_RESPONSE )
601
604
page = auth .list_users (max_results = 500 , app = user_mgt_app )
602
605
self ._check_page (page )
603
- self ._check_rpc_calls (recorder , {'maxResults' : 500 })
606
+ self ._check_rpc_calls (recorder , {'maxResults' : ' 500' })
604
607
605
608
def test_list_users_with_all_args (self , user_mgt_app ):
606
609
_ , recorder = _instrument_user_manager (user_mgt_app , 200 , MOCK_LIST_USERS_RESPONSE )
607
610
page = auth .list_users (page_token = 'foo' , max_results = 500 , app = user_mgt_app )
608
611
self ._check_page (page )
609
- self ._check_rpc_calls (recorder , {'nextPageToken' : 'foo' , 'maxResults' : 500 })
612
+ self ._check_rpc_calls (recorder , {'nextPageToken' : 'foo' , 'maxResults' : ' 500' })
610
613
611
614
def test_list_users_error (self , user_mgt_app ):
612
615
_instrument_user_manager (user_mgt_app , 500 , '{"error":"test"}' )
@@ -628,10 +631,10 @@ def _check_page(self, page):
628
631
629
632
def _check_rpc_calls (self , recorder , expected = None ):
630
633
if expected is None :
631
- expected = {'maxResults' : 1000 }
634
+ expected = {'maxResults' : ' 1000' }
632
635
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
635
638
636
639
637
640
class TestUserProvider (object ):
0 commit comments