Token Return

cloud_blobstore/__init__.py

@@ -52,14 +52,10 @@ def __iter__(self):
         If start_after_key is not None, iteration will begin on the next key if start_after_key is found on the
         first page of results. If it is not found on the first page of results, BlobPagingError will be raised.
         """
-        next_token = self.token
-
         while True:
-            self.token = next_token
-
-            resp = self.get_api_response(next_token)
+            resp = self.get_api_response(self.token)
             listing = self.get_listing_from_response(resp)
-
+            self.token = self.get_next_token_from_response(resp)
             if self.start_after_key:
                 while True:
                     try:
@@ -79,9 +75,9 @@ def __iter__(self):
 
             self.start_after_key = None
 
-            next_token = self.get_next_token_from_response(resp)
+            self.token = self.get_next_token_from_response(resp)
 
-            if not next_token:
+            if not self.token:
                 break
 
 

tests/blobstore_common_tests.py

@@ -183,6 +183,23 @@ def _testListV2Continuation(self, page_size, break_size):
                     start_after_key="nonsensicalnonsene"
                 )]
 
+    def testTokenAvailability(self):
+        blobiter = self.handle.list_v2(
+            self.test_fixtures_bucket,
+            "testList/prefix",
+            k_page_max=1,
+        )
+        stop_length = len([x for x in blobiter])
+
+        blobiter = self.handle.list_v2(
+            self.test_fixtures_bucket,
+            "testList/prefix",
+            k_page_max=1,
+        )
+        for idx, _ in enumerate(blobiter):
+            if idx >= stop_length - 1:
+                self.assertTrue(blobiter.token)
+
     def testGetPresignedUrl(self):
         presigned_url = self.handle.generate_presigned_GET_url(
             self.test_fixtures_bucket,