diff --git a/gcloud/datastore/test_transaction.py b/gcloud/datastore/test_transaction.py index 26526668407c..4ca7e2d3daa7 100644 --- a/gcloud/datastore/test_transaction.py +++ b/gcloud/datastore/test_transaction.py @@ -49,7 +49,7 @@ def test_rollback(self): xact.begin() xact.rollback() self.assertEqual(xact.id(), None) - self.assertEqual(connection._rolled_back, (_DATASET, 234)) + self.assertEqual(connection._rolled_back, _DATASET) self.assertEqual(connection._xact, None) def test_commit_no_auto_ids(self): @@ -127,7 +127,7 @@ class Foo(Exception): except Foo: pass # XXX #self.assertEqual(xact.id(), None) - #self.assertEqual(connection._rolled_back, (_DATASET, 234)) + #self.assertEqual(connection._rolled_back, _DATASET)) #self.assertEqual(connection._xact, None) # XXX should *not* have committed self.assertEqual(connection._committed, (_DATASET, mutation)) @@ -167,8 +167,8 @@ def transaction(self, xact=_marker): def begin_transaction(self, dataset_id): self._begun = dataset_id return self._xact_id - def rollback_transaction(self, dataset_id, xact_id): - self._rolled_back = (dataset_id, xact_id) + def rollback_transaction(self, dataset_id): + self._rolled_back = dataset_id def commit(self, dataset_id, mutation): self._committed = (dataset_id, mutation) return self._commit_result diff --git a/gcloud/datastore/transaction.py b/gcloud/datastore/transaction.py index 7c73af0a7371..c8cf88979e05 100644 --- a/gcloud/datastore/transaction.py +++ b/gcloud/datastore/transaction.py @@ -210,7 +210,7 @@ def rollback(self): - Sets the current connection's transaction reference to None. - Sets the current transaction's ID to None. """ - self.connection().rollback_transaction(self.dataset().id(), self.id()) + self.connection().rollback_transaction(self.dataset().id()) self.connection().transaction(None) self._id = None