diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2018-03-20 16:14:32 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-20 16:14:32 -0700 |
| commit | ed4321d1cb33199984118d801956822842771e7e (patch) | |
| tree | 16c54ef8d5409766c18ccae8fca685230680d620 /conformance/conformance_test.cc | |
| parent | e436ee0aa179340832281b7d90885e9ff15b3748 (diff) | |
| parent | 11d26ce24c90a6cf2544f71e09970513550ef6c6 (diff) | |
Merge pull request #4387 from acozzette/down-integrate
Integrated internal changes from Google
Diffstat (limited to 'conformance/conformance_test.cc')
| -rw-r--r-- | conformance/conformance_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc index d44c909a..22bbbfb3 100644 --- a/conformance/conformance_test.cc +++ b/conformance/conformance_test.cc @@ -1910,6 +1910,10 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner, { TestAllTypesProto3 messageProto3; TestAllTypesProto2 messageProto2; + //TODO(yilunchong): update this behavior when unknown field's behavior + // changed in open source. Also delete + // Required.Proto3.ProtobufInput.UnknownVarint.ProtobufOutput + // from failure list of python_cpp python java TestUnknownMessage(messageProto3, true); TestUnknownMessage(messageProto2, false); } |