Take into account current behavior of /GetSession /BatchCreateSession in tests

Author: odeke-em

google/cloud/spanner_v1/testing/database_test.py

@@ -79,7 +79,6 @@ def spanner_api(self):
                 channel = grpc.insecure_channel(self._instance.emulator_host)
                 self._x_goog_request_id_interceptor = XGoogRequestIDHeaderInterceptor()
                 self._interceptors.append(self._x_goog_request_id_interceptor)
-                # print("self._interceptors", self._interceptors)
                 channel = grpc.intercept_channel(channel, *self._interceptors)
                 transport = SpannerGrpcTransport(channel=channel)
                 self._spanner_api = SpannerClient(

google/cloud/spanner_v1/testing/interceptors.py

@@ -90,9 +90,7 @@ def intercept(self, method, request_or_iterator, call_details):
             )
 
         response_or_iterator = method(request_or_iterator, call_details)
-        print("call_details", call_details, "\n", response_or_iterator)
         streaming = getattr(response_or_iterator, "__iter__", None) is not None
-        print("x_append", call_details.method, x_goog_request_id)
         with self.__lock:
             if streaming:
                 self._stream_req_segments.append(

tests/mockserver_tests/test_request_id_header.py

@@ -73,15 +73,16 @@ def test_snapshot_execute_sql(self):
         assert got_stream_segments == want_stream_segments
 
     def test_snapshot_read_concurrent(self):
+        db = self.database
         # Trigger BatchCreateSessions firstly.
-        with self.database.snapshot() as snapshot:
+        with db.snapshot() as snapshot:
             rows = snapshot.execute_sql("select 1")
             for row in rows:
                 _ = row
 
         # The other requests can then proceed.
         def select1():
-            with self.database.snapshot() as snapshot:
+            with db.snapshot() as snapshot:
                 rows = snapshot.execute_sql("select 1")
                 res_list = []
                 for row in rows:
@@ -112,17 +113,56 @@ def select1():
         requests = self.spanner_service.requests
         self.assertEqual(2 + n * 2, len(requests), msg=requests)
 
-        client_id = self.database._nth_client_id
-        channel_id = self.database._channel_id
+        client_id = db._nth_client_id
+        channel_id = db._channel_id
         got_stream_segments, got_unary_segments = self.canonicalize_request_id_headers()
 
         want_unary_segments = [
             (
                 "/google.spanner.v1.Spanner/BatchCreateSessions",
                 (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 1, 1),
             ),
+            (
+                "/google.spanner.v1.Spanner/GetSession",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 3, 1),
+            ),
+            (
+                "/google.spanner.v1.Spanner/GetSession",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 5, 1),
+            ),
+            (
+                "/google.spanner.v1.Spanner/GetSession",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 7, 1),
+            ),
+            (
+                "/google.spanner.v1.Spanner/GetSession",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 9, 1),
+            ),
+            (
+                "/google.spanner.v1.Spanner/GetSession",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 11, 1),
+            ),
+            (
+                "/google.spanner.v1.Spanner/GetSession",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 13, 1),
+            ),
+            (
+                "/google.spanner.v1.Spanner/GetSession",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 15, 1),
+            ),
+            (
+                "/google.spanner.v1.Spanner/GetSession",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 17, 1),
+            ),
+            (
+                "/google.spanner.v1.Spanner/GetSession",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 19, 1),
+            ),
+            (
+                "/google.spanner.v1.Spanner/GetSession",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 21, 1),
+            ),
         ]
-        print("got_unary", got_unary_segments)
         assert got_unary_segments == want_unary_segments
 
         want_stream_segments = [
@@ -132,39 +172,43 @@ def select1():
             ),
             (
                 "/google.spanner.v1.Spanner/ExecuteStreamingSql",
-                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 3, 1),
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 4, 1),
             ),
             (
                 "/google.spanner.v1.Spanner/ExecuteStreamingSql",
-                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 4, 1),
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 6, 1),
             ),
             (
                 "/google.spanner.v1.Spanner/ExecuteStreamingSql",
-                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 5, 1),
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 8, 1),
             ),
             (
                 "/google.spanner.v1.Spanner/ExecuteStreamingSql",
-                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 6, 1),
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 10, 1),
             ),
             (
                 "/google.spanner.v1.Spanner/ExecuteStreamingSql",
-                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 7, 1),
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 12, 1),
             ),
             (
                 "/google.spanner.v1.Spanner/ExecuteStreamingSql",
-                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 8, 1),
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 14, 1),
             ),
             (
                 "/google.spanner.v1.Spanner/ExecuteStreamingSql",
-                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 9, 1),
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 16, 1),
             ),
             (
                 "/google.spanner.v1.Spanner/ExecuteStreamingSql",
-                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 10, 1),
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 18, 1),
             ),
             (
                 "/google.spanner.v1.Spanner/ExecuteStreamingSql",
-                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 11, 1),
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 20, 1),
+            ),
+            (
+                "/google.spanner.v1.Spanner/ExecuteStreamingSql",
+                (1, REQ_RAND_PROCESS_ID, client_id, channel_id, 22, 1),
             ),
         ]
         assert got_stream_segments == want_stream_segments
@@ -265,7 +309,6 @@ def test_unary_retryable_error(self):
             )
         ]
 
-        print("got_unary_segments", got_unary_segments)
         assert got_unary_segments == want_unary_segments
         assert got_stream_segments == want_stream_segments