diff --git a/tableauserverclient/server/pager.py b/tableauserverclient/server/pager.py index 8d988f483..a53bd930f 100644 --- a/tableauserverclient/server/pager.py +++ b/tableauserverclient/server/pager.py @@ -32,10 +32,6 @@ def __init__(self, endpoint, request_opts=None): self._count = 0 self._options = RequestOptions() - # Pager assumes deterministic order but solr doesn't guarantee sort order unless specified - if not self._options.sort: - self._options.sort.add(Sort(RequestOptions.Field.Name, RequestOptions.Direction.Asc)) - def __iter__(self): # Fetch the first page current_item_list, last_pagination_item = self._endpoint(self._options) diff --git a/test/test_group.py b/test/test_group.py index 4886634fc..244ba47b8 100644 --- a/test/test_group.py +++ b/test/test_group.py @@ -54,7 +54,7 @@ def test_populate_users(self): with open(POPULATE_USERS, 'rb') as f: response_xml = f.read().decode('utf-8') with requests_mock.mock() as m: - m.get(self.baseurl + '/e7833b48-c6f7-47b5-a2a7-36e7dd232758/users?pageNumber=1&pageSize=100&sort=name:asc', + m.get(self.baseurl + '/e7833b48-c6f7-47b5-a2a7-36e7dd232758/users?pageNumber=1&pageSize=100', text=response_xml, complete_qs=True) single_group = TSC.GroupItem(name='Test Group') single_group._id = 'e7833b48-c6f7-47b5-a2a7-36e7dd232758' diff --git a/test/test_pager.py b/test/test_pager.py index 5a6e9a4ed..52089180d 100644 --- a/test/test_pager.py +++ b/test/test_pager.py @@ -55,10 +55,10 @@ def test_pager_with_options(self): page_3 = f.read().decode('utf-8') with requests_mock.mock() as m: # Register Pager with some pages - m.get(self.baseurl + "?pageNumber=1&pageSize=1&sort=name:asc", complete_qs=True, text=page_1) - m.get(self.baseurl + "?pageNumber=2&pageSize=1&sort=name:asc", complete_qs=True, text=page_2) - m.get(self.baseurl + "?pageNumber=3&pageSize=1&sort=name:asc", complete_qs=True, text=page_3) - m.get(self.baseurl + "?pageNumber=1&pageSize=3&sort=name:asc", complete_qs=True, text=page_1) + m.get(self.baseurl + "?pageNumber=1&pageSize=1", complete_qs=True, text=page_1) + m.get(self.baseurl + "?pageNumber=2&pageSize=1", complete_qs=True, text=page_2) + m.get(self.baseurl + "?pageNumber=3&pageSize=1", complete_qs=True, text=page_3) + m.get(self.baseurl + "?pageNumber=1&pageSize=3", complete_qs=True, text=page_1) # Starting on page 2 should get 2 out of 3 opts = TSC.RequestOptions(2, 1)