More test plumbing

Author: odeke-em

tests/unit/test_batch.py

@@ -259,6 +259,10 @@ def test_commit_ok(self):
             [
                 ("google-cloud-resource-prefix", database.name),
                 ("x-goog-spanner-route-to-leader", "true"),
+                (
+                    "x-goog-spanner-request-id",
+                    f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
+                )
             ],
         )
         self.assertEqual(request_options, RequestOptions())
@@ -577,6 +581,10 @@ def _test_batch_write_with_request_options(
             [
                 ("google-cloud-resource-prefix", database.name),
                 ("x-goog-spanner-route-to-leader", "true"),
+                (
+                    "x-goog-spanner-request-id",
+                    f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.1.1.1",
+                ),
             ],
         )
         if request_options is None:

tests/unit/test_database.py

@@ -1204,7 +1204,7 @@ def _execute_partitioned_dml_helper(
                 ("x-goog-spanner-route-to-leader", "true"),
                 (
                     "x-goog-spanner-request-id",
-                    f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
+                    f"1.{REQ_RAND_PROCESS_ID}.{database._nth_client_id}.{database._channel_id}.1.1",
                 ),
             ],
         )
@@ -3217,6 +3217,7 @@ def __init__(
         self.directed_read_options = directed_read_options
         self._nth_client_id = _Client.NTH_CLIENT.increment()
         self._nth_request = AtomicCounter()
+        self.credentials = {}
 
     @property
     def _next_nth_request(self):