From 6826cc9ea02d6c322d88b09aa8ccea346e3ed48d Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 28 Dec 2021 15:15:21 -0800 Subject: [PATCH] Converted skips to expected failures where possible. --- .../pb_unit_tests/descriptor_test_wrapper.py | 4 +-- python/pb_unit_tests/message_test_wrapper.py | 4 +-- .../pb_unit_tests/reflection_test_wrapper.py | 12 +++---- .../unknown_fields_test_wrapper.py | 33 +++++++------------ 4 files changed, 20 insertions(+), 33 deletions(-) diff --git a/python/pb_unit_tests/descriptor_test_wrapper.py b/python/pb_unit_tests/descriptor_test_wrapper.py index 06696cd247..51c5ceff9e 100644 --- a/python/pb_unit_tests/descriptor_test_wrapper.py +++ b/python/pb_unit_tests/descriptor_test_wrapper.py @@ -47,9 +47,9 @@ descriptor_test.MakeDescriptorTest.testMakeDescriptorWithUnsignedIntField.__unit # We must skip these tests entirely (rather than running them with # __unittest_expecting_failure__) because they error out in setUp(): # -# NotImplementedError: unset repeated +# AttributeError: 'google.protobuf.pyext._message.DescriptorPool' object has no attribute 'Add' # -# TODO: change to __unittest_expecting_failure__ when repeated fields are checked in. +# TODO: change to __unittest_expecting_failure__ when DescriptorPool.Add() is implemented descriptor_test.DescriptorTest.testAggregateOptions.__unittest_skip__ = True descriptor_test.DescriptorTest.testComplexExtensionOptions.__unittest_skip__ = True descriptor_test.DescriptorTest.testContainingServiceFixups.__unittest_skip__ = True diff --git a/python/pb_unit_tests/message_test_wrapper.py b/python/pb_unit_tests/message_test_wrapper.py index f27e46630c..578c5da78f 100644 --- a/python/pb_unit_tests/message_test_wrapper.py +++ b/python/pb_unit_tests/message_test_wrapper.py @@ -126,9 +126,9 @@ message_test.Proto3Test.testSubmessageMap.__unittest_expecting_failure__ = True # We must skip these tests entirely (rather than running them with # __unittest_expecting_failure__) because they error out in setUpClass(): # -# NotImplementedError: unset repeated +# AttributeError: 'google.protobuf.pyext._message.DescriptorPool' object has no attribute 'Add' # -# TODO: change to __unittest_expecting_failure__ when repeated fields are available +# TODO: change to __unittest_expecting_failure__ when DescriptorPoo.Add is implemented message_test.OversizeProtosTest.__unittest_skip__ = True if __name__ == '__main__': diff --git a/python/pb_unit_tests/reflection_test_wrapper.py b/python/pb_unit_tests/reflection_test_wrapper.py index 0185d24d82..420f4b91ca 100644 --- a/python/pb_unit_tests/reflection_test_wrapper.py +++ b/python/pb_unit_tests/reflection_test_wrapper.py @@ -137,14 +137,10 @@ reflection_test.SerializationTest.testSerializeUninitialized.__unittest_expectin reflection_test.SerializationTest.testSerializeUninitializedSubMessage.__unittest_expecting_failure__ = True reflection_test.SerializationTest.testSerializeWithOptionalGroup.__unittest_expecting_failure__ = True reflection_test.TestAllTypesEqualityTest.testEmptyProtosEqual.__unittest_expecting_failure__ = True - -# We must skip these tests entirely (rather than running them with -# __unittest_expecting_failure__) because they error out in setUp(): -# -# NotImplementedError: access repeated -# -# TODO: change to __unittest_expecting_failure__ when repeated fields are available. -reflection_test.FullProtosEqualityTest.__unittest_skip__ = True +reflection_test.FullProtosEqualityTest.testAllFieldsFilledEquality.__unittest_expecting_failure__ = True +reflection_test.FullProtosEqualityTest.testNonRepeatedComposite.__unittest_expecting_failure__ = True +reflection_test.FullProtosEqualityTest.testNonRepeatedCompositeHasBits.__unittest_expecting_failure__ = True +reflection_test.FullProtosEqualityTest.testRepeatedComposite.__unittest_expecting_failure__ = True if __name__ == '__main__': unittest.main(module=reflection_test, verbosity=2) diff --git a/python/pb_unit_tests/unknown_fields_test_wrapper.py b/python/pb_unit_tests/unknown_fields_test_wrapper.py index 6888d3641d..368c06012d 100644 --- a/python/pb_unit_tests/unknown_fields_test_wrapper.py +++ b/python/pb_unit_tests/unknown_fields_test_wrapper.py @@ -32,27 +32,18 @@ import unittest # NotImplementedError: access repeated # # TODO: change to __unittest_expecting_failure__ when repeated fields are available -unknown_fields_test.UnknownEnumValuesTest.testCheckUnknownFieldValueForEnum.__unittest_skip__ = True -unknown_fields_test.UnknownEnumValuesTest.testRoundTrip.__unittest_skip__ = True -unknown_fields_test.UnknownEnumValuesTest.testUnknownEnumValue.__unittest_skip__ = True -unknown_fields_test.UnknownEnumValuesTest.testUnknownPackedEnumValue.__unittest_skip__ = True -unknown_fields_test.UnknownEnumValuesTest.testUnknownParseMismatchEnumValue.__unittest_skip__ = True -unknown_fields_test.UnknownEnumValuesTest.testUnknownRepeatedEnumValue.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsAccessorsTest.testCheckUnknownFieldValue.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsAccessorsTest.testClear.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsAccessorsTest.testCopyFrom.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsAccessorsTest.testMergeFrom.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsAccessorsTest.testSubUnknownFields.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsAccessorsTest.testUnknownExtensions.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsAccessorsTest.testUnknownField.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsAccessorsTest.testUnknownFieldsNoMemoryLeak.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsTest.testByteSize.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsTest.testDiscardUnknownFields.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsTest.testEquals.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsTest.testListFields.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsTest.testSerialize.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsTest.testSerializeMessageSetWireFormatUnknownExtension.__unittest_skip__ = True -unknown_fields_test.UnknownFieldsTest.testSerializeProto3.__unittest_skip__ = True +unknown_fields_test.UnknownEnumValuesTest.testCheckUnknownFieldValueForEnum.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownEnumValuesTest.testRoundTrip.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownFieldsAccessorsTest.testCheckUnknownFieldValue.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownFieldsAccessorsTest.testClear.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownFieldsAccessorsTest.testMergeFrom.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownFieldsAccessorsTest.testSubUnknownFields.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownFieldsAccessorsTest.testUnknownExtensions.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownFieldsAccessorsTest.testUnknownField.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownFieldsAccessorsTest.testUnknownFieldsNoMemoryLeak.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownFieldsTest.testDiscardUnknownFields.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownFieldsTest.testEquals.__unittest_expecting_failure__ = True +unknown_fields_test.UnknownFieldsTest.testSerializeMessageSetWireFormatUnknownExtension.__unittest_expecting_failure__ = True if __name__ == '__main__': unittest.main(module=unknown_fields_test, verbosity=2)