Updating datastore system tests to use new iterator.

Author: dhermes

system_tests/clear_datastore.py

@@ -45,9 +45,8 @@ def fetch_keys(kind, client, fetch_max=FETCH_MAX, query=None, cursor=None):
         query.keys_only()
 
     iterator = query.fetch(limit=fetch_max, start_cursor=cursor)
-
-    entities, _, cursor = iterator.next_page()
-    return query, entities, cursor
+    page = six.next(iterator.pages)
+    return query, list(page), iterator.next_page_token
 
 
 def get_ancestors(entities):

system_tests/datastore.py

@@ -17,6 +17,7 @@
 import unittest
 
 import httplib2
+import six
 
 from google.cloud._helpers import UTC
 from google.cloud import datastore
@@ -260,14 +261,16 @@ def test_limit_queries(self):
 
         # Fetch characters.
         iterator = query.fetch(limit=limit)
-        character_entities, _, cursor = iterator.next_page()
+        page = six.next(iterator.pages)
+        character_entities = list(page)
+        cursor = iterator.next_page_token
         self.assertEqual(len(character_entities), limit)
 
         # Check cursor after fetch.
         self.assertIsNotNone(cursor)
 
-        # Fetch remaining of characters.
-        new_character_entities = list(iterator)
+        # Fetch remaining characters.
+        new_character_entities = list(query.fetch(start_cursor=cursor))
         characters_remaining = len(self.CHARACTERS) - limit
         self.assertEqual(len(new_character_entities), characters_remaining)
 
@@ -362,7 +365,9 @@ def test_query_paginate_with_offset(self):
         iterator = page_query.fetch(limit=limit, offset=offset)
 
         # Fetch characters.
-        entities, _, cursor = iterator.next_page()
+        page = six.next(iterator.pages)
+        entities = list(page)
+        cursor = iterator.next_page_token
         self.assertEqual(len(entities), limit)
         self.assertEqual(entities[0]['name'], 'Robb')
         self.assertEqual(entities[1]['name'], 'Bran')
@@ -385,7 +390,9 @@ def test_query_paginate_with_start_cursor(self):
         iterator = page_query.fetch(limit=limit, offset=offset)
 
         # Fetch characters.
-        entities, _, cursor = iterator.next_page()
+        page = six.next(iterator.pages)
+        entities = list(page)
+        cursor = iterator.next_page_token
         self.assertEqual(len(entities), limit)
 
         # Use cursor to create a fresh query.