diff options
| -rw-r--r-- | llvm/bindings/python/llvm/tests/base.py | 5 | ||||
| -rw-r--r-- | llvm/bindings/python/llvm/tests/test_disassembler.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/llvm/bindings/python/llvm/tests/base.py b/llvm/bindings/python/llvm/tests/base.py index 194f1a41192..aa435bc1f35 100644 --- a/llvm/bindings/python/llvm/tests/base.py +++ b/llvm/bindings/python/llvm/tests/base.py @@ -1,6 +1,8 @@ import os.path +import sys import unittest + POSSIBLE_TEST_BINARIES = [ 'libreadline.so.5', 'libreadline.so.6', @@ -15,6 +17,9 @@ POSSIBLE_TEST_BINARY_PATHS = [ ] class TestBase(unittest.TestCase): + if sys.version_info.major == 2: + assertRaisesRegex = unittest.TestCase.assertRaisesRegexp + def get_test_binary(self): """Helper to obtain a test binary for object file testing. diff --git a/llvm/bindings/python/llvm/tests/test_disassembler.py b/llvm/bindings/python/llvm/tests/test_disassembler.py index f469ffbf393..29f2f7060ba 100644 --- a/llvm/bindings/python/llvm/tests/test_disassembler.py +++ b/llvm/bindings/python/llvm/tests/test_disassembler.py @@ -19,7 +19,7 @@ class TestDisassembler(TestBase): self.assertEqual(s, '\tjcxz\t-127') def test_nonexistent_triple(self): - with self.assertRaisesRegexp(Exception, "Could not obtain disassembler for triple"): + with self.assertRaisesRegex(Exception, "Could not obtain disassembler for triple"): Disassembler("nonexistent-triple-raises") def test_get_instructions(self): |
