Token Return

cloud_blobstore/__init__.py

@@ -55,11 +55,9 @@ def __iter__(self):
         next_token = self.token
 
         while True:
-            self.token = next_token
-
             resp = self.get_api_response(next_token)
             listing = self.get_listing_from_response(resp)
-
+            self.token = next_token
             if self.start_after_key:
                 while True:
                     try:
@@ -84,7 +82,6 @@ def __iter__(self):
             if not next_token:
                 break
 
-
 class BlobStore:
     """Abstract base class for all blob stores."""
     def __init__(self):

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,