From 3083d8cee7ec3233bbac8feeb23b4ccc74b5bf99 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Sat, 15 Aug 2015 10:07:38 -0400 Subject: Fix --cpp_implementation test failure. Test both pure Python and cpp implementation in tox. Signed-off-by: Dan O'Reilly --- python/google/protobuf/internal/reflection_test.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'python/google') diff --git a/python/google/protobuf/internal/reflection_test.py b/python/google/protobuf/internal/reflection_test.py index 8967dc2e..1a162272 100755 --- a/python/google/protobuf/internal/reflection_test.py +++ b/python/google/protobuf/internal/reflection_test.py @@ -1647,18 +1647,18 @@ class ReflectionTest(unittest.TestCase): file_descriptor_proto.name = another_file_name m2 = file_descriptor_proto.message_type.add() m2.name = 'msg2' - try: + with self.assertRaises(TypeError) as cm: descriptor.FileDescriptor( another_file_name, package_name, serialized_pb=file_descriptor_proto.SerializeToString()) - except TypeError as e: - message = str(e) - else: - self.fail("Did not raise TypeError") - - self.assertTrue('test_file_descriptor_errors.msg1' in message) - self.assertTrue('test_file_descriptor_errors.proto' in message) + self.assertTrue(hasattr(cm, 'exception'), '%s not raised' % + getattr(cm.expected, '__name__', cm.expected)) + self.assertIn('test_file_descriptor_errors.proto', str(cm.exception)) + # Error message will say something about this definition being a + # duplicate, though we don't check the message exactly to avoid a + # dependency on the C++ logging code. + self.assertIn('test_file_descriptor_errors.msg1', str(cm.exception)) def testStringUTF8Encoding(self): proto = unittest_pb2.TestAllTypes() -- cgit v1.2.3