diff --git a/python/minimal_test.py b/python/minimal_test.py index 8e7a65a77e..b88d7320c0 100644 --- a/python/minimal_test.py +++ b/python/minimal_test.py @@ -143,17 +143,17 @@ class OversizeProtosTest(unittest.TestCase): extension_int32 = more_extensions_pb2.optional_int_extension extendee_proto.Extensions[extension_int32] = 23 - + extension_repeated = more_extensions_pb2.repeated_int_extension extendee_proto.Extensions[extension_repeated].append(11) extension_msg = more_extensions_pb2.optional_message_extension extendee_proto.Extensions[extension_msg].foreign_message_int = 56 - + # Set some normal fields. extendee_proto.optional_int32 = 1 extendee_proto.repeated_string.append('hi') - + expected = { extension_int32: True, extension_msg: True, diff --git a/python/pb_unit_tests/text_format_test_wrapper.py b/python/pb_unit_tests/text_format_test_wrapper.py index b8cf207b62..151196458a 100644 --- a/python/pb_unit_tests/text_format_test_wrapper.py +++ b/python/pb_unit_tests/text_format_test_wrapper.py @@ -29,6 +29,7 @@ from google.protobuf.internal import _parameterized sep = _parameterized._SEPARATOR +# These rely on the UnknownFields accessor, which we are trying to deprecate. text_format_test.OnlyWorksWithProto2RightNowTests.testPrintUnknownFields.__unittest_expecting_failure__ = True getattr(text_format_test.TextFormatMessageToStringTests, "testPrintUnknownFieldsEmbeddedMessageInBytes" + sep + "0").__unittest_expecting_failure__ = True getattr(text_format_test.TextFormatMessageToStringTests, "testPrintUnknownFieldsEmbeddedMessageInBytes" + sep + "1").__unittest_expecting_failure__ = True