Merge pull request #37045 from apache/cherrypick-37018

Cherrypick #37018 to release-2.70

Author: Amar3tto

.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Dataflow.json

@@ -1,4 +1,4 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to run",
-  "modification": 14
+  "modification": 15
 }

.github/trigger_files/beam_PostCommit_Python_Xlang_Gcp_Direct.json

@@ -1,4 +1,4 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to run",
-  "modification": 14
+  "modification": 15
 }

sdks/python/apache_beam/io/gcp/tests/xlang_spannerio_it_test.py

@@ -103,6 +103,11 @@ def setUpClass(cls):
     )
 
     pipeline = TestPipeline(is_integration_test=True)
+
+    runner_name = type(pipeline.runner).__name__
+    if 'DataflowRunner' in runner_name:
+      pytest.skip("Spanner emulator not compatible with dataflow runner.")
+
     argv = pipeline.get_full_options_as_args()
 
     known_args, _ = parser.parse_known_args(argv)

sdks/python/apache_beam/ml/rag/ingestion/spanner_it_test.py

@@ -138,6 +138,11 @@ class SpannerVectorWriterTest(unittest.TestCase):
   @classmethod
   def setUpClass(cls):
     """Set up Spanner emulator for all tests."""
+    pipeline = TestPipeline(is_integration_test=True)
+    runner_name = type(pipeline.runner).__name__
+    if 'DataflowRunner' in runner_name:
+      pytest.skip("Spanner emulator not compatible with dataflow runner.")
+
     cls.project_id = 'test-project'
     cls.instance_id = 'test-instance'
     cls.table_name = 'embeddings'