Fix regression in .

Author: tseaver

gcloud/datastore/test_transaction.py

@@ -105,7 +105,7 @@ def test_rollback(self):
         xact.begin()
         xact.rollback()
         self.assertEqual(xact.id, None)
-        self.assertEqual(connection._rolled_back, _DATASET)
+        self.assertEqual(connection._rolled_back, (_DATASET, 234))
 
     def test_commit_no_auto_ids(self):
         _DATASET = 'DATASET'
@@ -159,7 +159,7 @@ class Foo(Exception):
                 raise Foo()
         except Foo:
             self.assertEqual(xact.id, None)
-            self.assertEqual(connection._rolled_back, _DATASET)
+            self.assertEqual(connection._rolled_back, (_DATASET, 234))
         self.assertEqual(connection._committed, None)
         self.assertEqual(xact.id, None)
 
@@ -187,8 +187,8 @@ def begin_transaction(self, dataset_id):
         self._begun = dataset_id
         return self._xact_id
 
-    def rollback(self, dataset_id):
-        self._rolled_back = dataset_id
+    def rollback(self, dataset_id, transaction_id):
+        self._rolled_back = dataset_id, transaction_id
 
     def commit(self, dataset_id, mutation):
         self._committed = (dataset_id, mutation)

gcloud/datastore/transaction.py

@@ -140,7 +140,7 @@ def rollback(self):
         - Sets the current connection's transaction reference to None.
         - Sets the current transaction's ID to None.
         """
-        self.connection.rollback(self._dataset_id)
+        self.connection.rollback(self._dataset_id, self._id)
         self._id = None
 
     def commit(self):