diff options
| author |  Jisi Liu <liujisi@google.com> | 2017-08-21 10:39:27 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-08-21 10:39:27 -0700 |
| commit | ba4e54724d2e6a1881c4fe88664d81fbacaf8c08 (patch) | |
| tree | 5451ab616f035b92d006e51ec01b4c0dabb3f6d0 /python/compatibility_tests | |
| parent | 472f700884a2cd4e9b621c5e4b706a9b6de7c870 (diff) | |
| parent | 139775ccc040a07e07c5407e34834dab27928cbc (diff) | |
Merge pull request #3529 from pherl/merge3.4.x
Merge 3.4.x into master
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( |