Skip to content

Commit d36647c

Browse files
odeke-emodeke-em
committed
Update test_spannner.test_transaction tests
1 parent 0478a40 commit d36647c

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

‎tests/unit/test_spanner.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ def test_transaction_should_use_transaction_id_if_error_with_first_batch_update(
651651
("x-goog-spanner-route-to-leader", "true"),
652652
(
653653
"x-goog-spanner-request-id",
654-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
654+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.2.1",
655655
),
656656
],
657657
)
@@ -688,7 +688,7 @@ def test_transaction_should_use_transaction_id_returned_by_first_query(self):
688688
("x-goog-spanner-route-to-leader", "true"),
689689
(
690690
"x-goog-spanner-request-id",
691-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
691+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.2.1",
692692
),
693693
],
694694
)
@@ -725,7 +725,7 @@ def test_transaction_should_use_transaction_id_returned_by_first_update(self):
725725
("x-goog-spanner-route-to-leader", "true"),
726726
(
727727
"x-goog-spanner-request-id",
728-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
728+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.2.1",
729729
),
730730
],
731731
)
@@ -812,7 +812,7 @@ def test_transaction_should_use_transaction_id_returned_by_first_read(self):
812812
("x-goog-spanner-route-to-leader", "true"),
813813
(
814814
"x-goog-spanner-request-id",
815-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
815+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.2.1",
816816
),
817817
],
818818
retry=RETRY,
@@ -848,7 +848,7 @@ def test_transaction_should_use_transaction_id_returned_by_first_batch_update(se
848848
("x-goog-spanner-route-to-leader", "true"),
849849
(
850850
"x-goog-spanner-request-id",
851-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
851+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.2.1",
852852
),
853853
],
854854
retry=RETRY,
@@ -906,7 +906,7 @@ def test_transaction_for_concurrent_statement_should_begin_one_transaction_with_
906906
("x-goog-spanner-route-to-leader", "true"),
907907
(
908908
"x-goog-spanner-request-id",
909-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
909+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.2.1",
910910
),
911911
],
912912
)
@@ -918,7 +918,7 @@ def test_transaction_for_concurrent_statement_should_begin_one_transaction_with_
918918
("x-goog-spanner-route-to-leader", "true"),
919919
(
920920
"x-goog-spanner-request-id",
921-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
921+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.3.1",
922922
),
923923
],
924924
retry=RETRY,
@@ -965,7 +965,7 @@ def test_transaction_for_concurrent_statement_should_begin_one_transaction_with_
965965
("x-goog-spanner-route-to-leader", "true"),
966966
(
967967
"x-goog-spanner-request-id",
968-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
968+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.3.1",
969969
),
970970
],
971971
)
@@ -991,7 +991,7 @@ def test_transaction_for_concurrent_statement_should_begin_one_transaction_with_
991991
("x-goog-spanner-route-to-leader", "true"),
992992
(
993993
"x-goog-spanner-request-id",
994-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
994+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.2.1",
995995
),
996996
],
997997
retry=RETRY,
@@ -1043,7 +1043,7 @@ def test_transaction_for_concurrent_statement_should_begin_one_transaction_with_
10431043
("x-goog-spanner-route-to-leader", "true"),
10441044
(
10451045
"x-goog-spanner-request-id",
1046-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
1046+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.3.1",
10471047
),
10481048
],
10491049
)
@@ -1069,7 +1069,7 @@ def test_transaction_for_concurrent_statement_should_begin_one_transaction_with_
10691069
("x-goog-spanner-route-to-leader", "true"),
10701070
(
10711071
"x-goog-spanner-request-id",
1072-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
1072+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.2.1",
10731073
),
10741074
],
10751075
retry=RETRY,
@@ -1121,7 +1121,7 @@ def test_transaction_for_concurrent_statement_should_begin_one_transaction_with_
11211121
("x-goog-spanner-route-to-leader", "true"),
11221122
(
11231123
"x-goog-spanner-request-id",
1124-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
1124+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.3.1",
11251125
),
11261126
],
11271127
)
@@ -1147,7 +1147,7 @@ def test_transaction_for_concurrent_statement_should_begin_one_transaction_with_
11471147
("x-goog-spanner-route-to-leader", "true"),
11481148
(
11491149
"x-goog-spanner-request-id",
1150-
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
1150+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.2.1",
11511151
),
11521152
],
11531153
retry=RETRY,
@@ -1167,7 +1167,13 @@ def test_transaction_should_execute_sql_with_route_to_leader_disabled(self):
11671167

11681168
api.execute_streaming_sql.assert_called_once_with(
11691169
request=self._execute_sql_expected_request(database=database),
1170-
metadata=[("google-cloud-resource-prefix", database.name)],
1170+
metadata=[
1171+
("google-cloud-resource-prefix", database.name),
1172+
(
1173+
"x-goog-spanner-request-id",
1174+
f"1.{REQ_RAND_PROCESS_ID}.{_Client.NTH_CLIENT.value}.1.1.1",
1175+
)
1176+
],
11711177
timeout=TIMEOUT,
11721178
retry=RETRY,
11731179
)

0 commit comments

Comments
 (0)