Temporarily move back to fnapi runner as default (#35610)

* Temporarily move back to fnapi runner as default

* yapf

* Make some tests portable between direct runners

* More pportable tests

* 2 more tests to portable

Author: damccorm

sdks/python/apache_beam/coders/proto2_coder_test_messages_pb2.py

@@ -20,6 +20,7 @@
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: apache_beam/coders/proto2_coder_test_messages.proto
 # Protobuf Python Version: 5.28.0
+
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -29,35 +30,36 @@
 
 _sym_db = _symbol_database.Default()
 
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n3apache_beam/coders/proto2_coder_test_messages.proto\x12\x1aproto2_coder_test_messages\"P\n\x08MessageA\x12\x0e\n\x06\x66ield1\x18\x01 \x01(\t\x12\x34\n\x06\x66ield2\x18\x02 \x03(\x0b\x32$.proto2_coder_test_messages.MessageB\"\x1a\n\x08MessageB\x12\x0e\n\x06\x66ield1\x18\x01 \x01(\x08\"\x10\n\x08MessageC*\x04\x08\x64\x10j\"\xad\x01\n\x0eMessageWithMap\x12\x46\n\x06\x66ield1\x18\x01 \x03(\x0b\x32\x36.proto2_coder_test_messages.MessageWithMap.Field1Entry\x1aS\n\x0b\x46ield1Entry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x33\n\x05value\x18\x02 \x01(\x0b\x32$.proto2_coder_test_messages.MessageA:\x02\x38\x01\"V\n\x18ReferencesMessageWithMap\x12:\n\x06\x66ield1\x18\x01 \x03(\x0b\x32*.proto2_coder_test_messages.MessageWithMap\";\n\x08MessageD\"/\n\nNestedEnum\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x07\n\x03ONE\x10\x01\x12\x07\n\x03TWO\x10\x02*1\n\x0cTopLevelEnum\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x07\n\x03ONE\x10\x01\x12\x07\n\x03TWO\x10\x02:Z\n\x06\x66ield1\x12$.proto2_coder_test_messages.MessageC\x18\x65 \x01(\x0b\x32$.proto2_coder_test_messages.MessageA:Z\n\x06\x66ield2\x12$.proto2_coder_test_messages.MessageC\x18\x66 \x01(\x0b\x32$.proto2_coder_test_messages.MessageBB)\n\'org.apache.beam.sdk.extensions.protobuf')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(
+    b'\n3apache_beam/coders/proto2_coder_test_messages.proto\x12\x1aproto2_coder_test_messages\"P\n\x08MessageA\x12\x0e\n\x06\x66ield1\x18\x01 \x01(\t\x12\x34\n\x06\x66ield2\x18\x02 \x03(\x0b\x32$.proto2_coder_test_messages.MessageB\"\x1a\n\x08MessageB\x12\x0e\n\x06\x66ield1\x18\x01 \x01(\x08\"\x10\n\x08MessageC*\x04\x08\x64\x10j\"\xad\x01\n\x0eMessageWithMap\x12\x46\n\x06\x66ield1\x18\x01 \x03(\x0b\x32\x36.proto2_coder_test_messages.MessageWithMap.Field1Entry\x1aS\n\x0b\x46ield1Entry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x33\n\x05value\x18\x02 \x01(\x0b\x32$.proto2_coder_test_messages.MessageA:\x02\x38\x01\"V\n\x18ReferencesMessageWithMap\x12:\n\x06\x66ield1\x18\x01 \x03(\x0b\x32*.proto2_coder_test_messages.MessageWithMap\";\n\x08MessageD\"/\n\nNestedEnum\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x07\n\x03ONE\x10\x01\x12\x07\n\x03TWO\x10\x02*1\n\x0cTopLevelEnum\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x07\n\x03ONE\x10\x01\x12\x07\n\x03TWO\x10\x02:Z\n\x06\x66ield1\x12$.proto2_coder_test_messages.MessageC\x18\x65 \x01(\x0b\x32$.proto2_coder_test_messages.MessageA:Z\n\x06\x66ield2\x12$.proto2_coder_test_messages.MessageC\x18\x66 \x01(\x0b\x32$.proto2_coder_test_messages.MessageBB)\n\'org.apache.beam.sdk.extensions.protobuf'
+)
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'apache_beam.coders.proto2_coder_test_messages_pb2', _globals)
+_builder.BuildTopDescriptorsAndMessages(
+    DESCRIPTOR, 'apache_beam.coders.proto2_coder_test_messages_pb2', _globals)
 if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'\n\'org.apache.beam.sdk.extensions.protobuf'
+  _globals[
+      'DESCRIPTOR']._serialized_options = b'\n\'org.apache.beam.sdk.extensions.protobuf'
   _globals['_MESSAGEWITHMAP_FIELD1ENTRY']._loaded_options = None
   _globals['_MESSAGEWITHMAP_FIELD1ENTRY']._serialized_options = b'8\001'
-  _globals['_TOPLEVELENUM']._serialized_start=536
-  _globals['_TOPLEVELENUM']._serialized_end=585
-  _globals['_MESSAGEA']._serialized_start=83
-  _globals['_MESSAGEA']._serialized_end=163
-  _globals['_MESSAGEB']._serialized_start=165
-  _globals['_MESSAGEB']._serialized_end=191
-  _globals['_MESSAGEC']._serialized_start=193
-  _globals['_MESSAGEC']._serialized_end=209
-  _globals['_MESSAGEWITHMAP']._serialized_start=212
-  _globals['_MESSAGEWITHMAP']._serialized_end=385
-  _globals['_MESSAGEWITHMAP_FIELD1ENTRY']._serialized_start=302
-  _globals['_MESSAGEWITHMAP_FIELD1ENTRY']._serialized_end=385
-  _globals['_REFERENCESMESSAGEWITHMAP']._serialized_start=387
-  _globals['_REFERENCESMESSAGEWITHMAP']._serialized_end=473
-  _globals['_MESSAGED']._serialized_start=475
-  _globals['_MESSAGED']._serialized_end=534
-  _globals['_MESSAGED_NESTEDENUM']._serialized_start=487
-  _globals['_MESSAGED_NESTEDENUM']._serialized_end=534
+  _globals['_TOPLEVELENUM']._serialized_start = 536
+  _globals['_TOPLEVELENUM']._serialized_end = 585
+  _globals['_MESSAGEA']._serialized_start = 83
+  _globals['_MESSAGEA']._serialized_end = 163
+  _globals['_MESSAGEB']._serialized_start = 165
+  _globals['_MESSAGEB']._serialized_end = 191
+  _globals['_MESSAGEC']._serialized_start = 193
+  _globals['_MESSAGEC']._serialized_end = 209
+  _globals['_MESSAGEWITHMAP']._serialized_start = 212
+  _globals['_MESSAGEWITHMAP']._serialized_end = 385
+  _globals['_MESSAGEWITHMAP_FIELD1ENTRY']._serialized_start = 302
+  _globals['_MESSAGEWITHMAP_FIELD1ENTRY']._serialized_end = 385
+  _globals['_REFERENCESMESSAGEWITHMAP']._serialized_start = 387
+  _globals['_REFERENCESMESSAGEWITHMAP']._serialized_end = 473
+  _globals['_MESSAGED']._serialized_start = 475
+  _globals['_MESSAGED']._serialized_end = 534
+  _globals['_MESSAGED_NESTEDENUM']._serialized_start = 487
+  _globals['_MESSAGED_NESTEDENUM']._serialized_end = 534
 # @@protoc_insertion_point(module_scope)

sdks/python/apache_beam/examples/snippets/transforms/aggregation/groupby_test.py

@@ -152,8 +152,7 @@ def check_groupby_attr_result(grouped):
                       fruit='banana',
                       quantity=3,
                       unit_price=1.00),
-              ]),
-          #[END groupby_attr_result]
+              ]),  #[END groupby_attr_result]
       ]))
 
 
@@ -205,8 +204,7 @@ def check_groupby_attr_expr_result(grouped):
                       fruit='banana',
                       quantity=3,
                       unit_price=1.00),
-              ]),
-          #[END groupby_attr_expr_result]
+              ]),  #[END groupby_attr_expr_result]
       ]))
 
 

sdks/python/apache_beam/io/gcp/experimental/spannerio_test.py

@@ -387,7 +387,8 @@ def test_read_with_transaction(
   def test_invalid_transaction(
       self, mock_batch_snapshot_class, mock_client_class):
     # test exception raises at pipeline execution time
-    with self.assertRaisesRegex(Exception, "ValueError"), TestPipeline() as p:
+    error_string = "Invalid transaction object"
+    with self.assertRaisesRegex(Exception, error_string), TestPipeline() as p:
       transaction = (
           p | beam.Create([{
               "invalid": "transaction"