Merge pull request #3092 from dhermes/fix-2746-rollback

Making datastore Connection.rollback() return low-level protobuf.

Author: dhermes

packages/google-cloud-datastore/google/cloud/datastore/_http.py

@@ -447,11 +447,14 @@ def rollback(self, project, transaction_id):
         :type transaction_id: str
         :param transaction_id: The transaction ID returned from
                                :meth:`begin_transaction`.
+
+        :rtype: :class:`.datastore_pb2.RollbackResponse`
+        :returns: The returned protobuf response object.
         """
         request = _datastore_pb2.RollbackRequest()
         request.transaction = transaction_id
-        # Nothing to do with this response, so just execute the method.
-        self._datastore_api.rollback(project, request)
+        # Response is empty (i.e. no fields) but we return it anyway.
+        return self._datastore_api.rollback(project, request)
 
     def allocate_ids(self, project, key_pbs):
         """Obtain backend-generated IDs for a set of keys.

packages/google-cloud-datastore/google/cloud/datastore/transaction.py

@@ -200,6 +200,7 @@ def rollback(self):
         - Sets the current transaction's ID to None.
         """
         try:
+            # No need to use the response it contains nothing.
             self._client._connection.rollback(self.project, self._id)
         finally:
             super(Transaction, self).rollback()

packages/google-cloud-datastore/unit_tests/test__http.py

@@ -775,26 +775,31 @@ def test_commit_w_transaction(self):
     def test_rollback_ok(self):
         from google.cloud.proto.datastore.v1 import datastore_pb2
 
-        PROJECT = 'PROJECT'
-        TRANSACTION = b'xact'
-
+        project = 'PROJECT'
+        transaction = b'xact'
         rsp_pb = datastore_pb2.RollbackResponse()
+
+        # Create mock HTTP and client with response.
         http = Http({'status': '200'}, rsp_pb.SerializeToString())
         client = mock.Mock(_http=http, spec=['_http'])
+
+        # Make request.
         conn = self._make_one(client)
-        URI = '/'.join([
+        response = conn.rollback(project, transaction)
+
+        # Check the result and verify the callers.
+        self.assertEqual(response, rsp_pb)
+        uri = '/'.join([
             conn.api_base_url,
             conn.API_VERSION,
             'projects',
-            PROJECT + ':rollback',
+            project + ':rollback',
         ])
-        self.assertIsNone(conn.rollback(PROJECT, TRANSACTION))
         cw = http._called_with
-        self._verify_protobuf_call(cw, URI, conn)
-        rq_class = datastore_pb2.RollbackRequest
-        request = rq_class()
+        self._verify_protobuf_call(cw, uri, conn)
+        request = datastore_pb2.RollbackRequest()
         request.ParseFromString(cw['body'])
-        self.assertEqual(request.transaction, TRANSACTION)
+        self.assertEqual(request.transaction, transaction)
 
     def test_allocate_ids_empty(self):
         from google.cloud.proto.datastore.v1 import datastore_pb2