diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-08-18 16:25:35 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-08-18 16:25:35 -0700 |
| commit | 139775ccc040a07e07c5407e34834dab27928cbc (patch) | |
| tree | c500f4eabfea9d2e059f18b7d612c6e2a2db3ad5 /python/compatibility_tests | |
| parent | 1825d6d8f0aedcd7966c5c137a71e46ae650b3da (diff) | |
| parent | 26ac3e8e242f1cd6de15291a9973905a14b546ba (diff) | |
Merge remote-tracking branch 'origin/3.4.x' into mergemaster
Diffstat (limited to 'python/compatibility_tests')
| -rwxr-xr-x | python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/text_format_test.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/text_format_test.py b/python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/text_format_test.py index 6bf7befb..8267cd2c 100755 --- a/python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/text_format_test.py +++ b/python/compatibility_tests/v2.5.0/tests/google/protobuf/internal/text_format_test.py @@ -370,9 +370,8 @@ class TextFormatTest(unittest.TestCase): def testMergeBadExtension(self): message = unittest_pb2.TestAllExtensions() text = '[unknown_extension]: 8\n' - self.assertRaisesWithMessage( + self.assertRaises( text_format.ParseError, - '1:2 : Extension "unknown_extension" not registered.', text_format.Merge, text, message) message = unittest_pb2.TestAllTypes() self.assertRaisesWithMessage( |