diff --git a/test/atomic.py b/test/atomic.py index fd565cc..f2dda0a 100644 --- a/test/atomic.py +++ b/test/atomic.py @@ -88,21 +88,19 @@ class TestAtomic(unittest.TestCase): for ordering in test_these_orderings: loaded = bldr.atomic_load(ptr, ordering) - self.assertIn('load atomic', str(loaded)) + self.assert_('load atomic' in str(loaded)) self.assertEqual(ordering, str(loaded).strip().split(' ')[-3].rstrip(',')) - self.assertIn('align 1', str(loaded)) + self.assert_('align 1' in str(loaded)) stored = bldr.atomic_store(loaded, ptr, ordering) - self.assertIn('store atomic', str(stored)) + self.assert_('store atomic' in str(stored)) self.assertEqual(ordering, str(stored).strip().split(' ')[-3].rstrip(',')) - self.assertIn('align 1', str(stored)) + self.assert_('align 1' in str(stored)) fenced = bldr.fence(ordering) self.assertEqual(['fence', ordering], str(fenced).strip().split(' ')) if __name__ == '__main__': unittest.main() - - diff --git a/test/objcache.py b/test/objcache.py index 996ba47..c8bc7e4 100755 --- a/test/objcache.py +++ b/test/objcache.py @@ -13,12 +13,6 @@ class TestObjCache(unittest.TestCase): safe_repr(expr2)) self.fail(self._formatMessage(msg, standardMsg)) - def assertIsNot(self, expr1, expr2, msg=None): - if expr1 is expr2: - standardMsg = 'unexpectedly identical: %s' % (safe_repr( - expr1),) - self.fail(self._formatMessage(msg, standardMsg)) - def test_objcache(self): logging.debug("Testing module aliasing ..") m1 = Module.new('a') @@ -45,7 +39,7 @@ class TestObjCache(unittest.TestCase): gv1.delete() gv4 = GlobalVariable.new(m1, t, "gv") - self.assertIsNot(gv1, gv4) + self.assert_(gv1 is not gv4) logging.debug("Testing function aliasing 1 ..") b1 = f1.append_basic_block('entry') diff --git a/test/operands.py b/test/operands.py index 9d8a560..674bc9e 100755 --- a/test/operands.py +++ b/test/operands.py @@ -34,13 +34,6 @@ entry: class TestOperands(unittest.TestCase): - if sys.version_info[:2] < (2, 7): - def assertIs(self, expr1, expr2, msg=None): - if expr1 is not expr2: - standardMsg = '%s is not %s' % (safe_repr(expr1), - safe_repr(expr2)) - self.fail(self._formatMessage(msg, standardMsg)) - def test_operands(self): m = Module.from_assembly(StringIO(test_module)) logging.debug("-"*60) @@ -50,7 +43,7 @@ class TestOperands(unittest.TestCase): test_func = m.get_function_named("test_func") prod = m.get_function_named("prod") - #===----------------------------------------------------------------------=== + #===-----------------------------------------------------------=== # test operands @@ -63,15 +56,15 @@ class TestOperands(unittest.TestCase): logging.debug("Testing User.operands ..") - self.assertIs(i1.operands[-1], prod) - self.assertIs(i1.operands[0], test_func.args[0]) - self.assertIs(i1.operands[1], test_func.args[1]) - self.assertIs(i2.operands[0], i1) - self.assertIs(i2.operands[1], test_func.args[2]) + self.assert_(i1.operands[-1] is prod) + self.assert_(i1.operands[0] is test_func.args[0]) + self.assert_(i1.operands[1] is test_func.args[1]) + self.assert_(i2.operands[0] is i1) + self.assert_(i2.operands[1] is test_func.args[2]) self.assertEqual(len(i1.operands), 3) self.assertEqual(len(i2.operands), 2) - #===----------------------------------------------------------------------=== + #===-----------------------------------------------------------=== # show test_function logging.debug("Examining test_function `test_test_func':") @@ -89,4 +82,3 @@ class TestOperands(unittest.TestCase): if __name__ == '__main__': unittest.main() -