Subtracting offset instead of adding it.

Author: dhermes

gcloud/datastore/query.py

@@ -467,7 +467,9 @@ def __iter__(self):
             if self._limit is not None:
                 self._limit -= num_results
             if self._offset is not None:
-                self._offset += num_results
+                # NOTE: The offset goes down relative to the location
+                #       because we are updating the cursor each time.
+                self._offset -= num_results
             self.next_page()
 
 

gcloud/datastore/test_query.py

@@ -565,7 +565,7 @@ def test___iter___w_limit(self):
         qpb2 = _pb_from_query(query)
         qpb2.start_cursor = self._END
         qpb2.limit.value = 1
-        qpb2.offset = 14
+        qpb2.offset = 12
         EXPECTED1 = {
             'project': self._PROJECT,
             'query_pb': qpb1,