jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more Py26 test fixes

Browse source
This commit is contained in:
Ilan Schnell 2012-08-12 23:31:47 -05:00
commit 72f7fc4a99
3 changed files with 12 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/atomic.py
View file

@ -88,21 +88,19 @@ class TestAtomic(unittest.TestCase):
for ordering in test_these_orderings: for ordering in test_these_orderings:
loaded = bldr.atomic_load(ptr, ordering) loaded = bldr.atomic_load(ptr, ordering)
self.assertIn('load atomic', str(loaded)) self.assert_('load atomic' in str(loaded))
self.assertEqual(ordering, self.assertEqual(ordering,
str(loaded).strip().split(' ')[-3].rstrip(',')) 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) stored = bldr.atomic_store(loaded, ptr, ordering)
self.assertIn('store atomic', str(stored)) self.assert_('store atomic' in str(stored))
self.assertEqual(ordering, self.assertEqual(ordering,
str(stored).strip().split(' ')[-3].rstrip(',')) str(stored).strip().split(' ')[-3].rstrip(','))
self.assertIn('align 1', str(stored)) self.assert_('align 1' in str(stored))
fenced = bldr.fence(ordering) fenced = bldr.fence(ordering)
self.assertEqual(['fence', ordering], str(fenced).strip().split(' ')) self.assertEqual(['fence', ordering], str(fenced).strip().split(' '))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

8
test/objcache.py
View file

@ -13,12 +13,6 @@ class TestObjCache(unittest.TestCase):
safe_repr(expr2)) safe_repr(expr2))
self.fail(self._formatMessage(msg, standardMsg)) 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): def test_objcache(self):
logging.debug("Testing module aliasing ..") logging.debug("Testing module aliasing ..")
m1 = Module.new('a') m1 = Module.new('a')
@ -45,7 +39,7 @@ class TestObjCache(unittest.TestCase):
gv1.delete() gv1.delete()
gv4 = GlobalVariable.new(m1, t, "gv") gv4 = GlobalVariable.new(m1, t, "gv")
self.assertIsNot(gv1, gv4) self.assert_(gv1 is not gv4)
logging.debug("Testing function aliasing 1 ..") logging.debug("Testing function aliasing 1 ..")
b1 = f1.append_basic_block('entry') b1 = f1.append_basic_block('entry')

22
test/operands.py
View file

@ -34,13 +34,6 @@ entry:
class TestOperands(unittest.TestCase): 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): def test_operands(self):
m = Module.from_assembly(StringIO(test_module)) m = Module.from_assembly(StringIO(test_module))
logging.debug("-"*60) logging.debug("-"*60)
@ -50,7 +43,7 @@ class TestOperands(unittest.TestCase):
test_func = m.get_function_named("test_func") test_func = m.get_function_named("test_func")
prod = m.get_function_named("prod") prod = m.get_function_named("prod")
#===----------------------------------------------------------------------=== #===-----------------------------------------------------------===
# test operands # test operands
@ -63,15 +56,15 @@ class TestOperands(unittest.TestCase):
logging.debug("Testing User.operands ..") logging.debug("Testing User.operands ..")
self.assertIs(i1.operands[-1], prod) self.assert_(i1.operands[-1] is prod)
self.assertIs(i1.operands[0], test_func.args[0]) self.assert_(i1.operands[0] is test_func.args[0])
self.assertIs(i1.operands[1], test_func.args[1]) self.assert_(i1.operands[1] is test_func.args[1])
self.assertIs(i2.operands[0], i1) self.assert_(i2.operands[0] is i1)
self.assertIs(i2.operands[1], test_func.args[2]) self.assert_(i2.operands[1] is test_func.args[2])
self.assertEqual(len(i1.operands), 3) self.assertEqual(len(i1.operands), 3)
self.assertEqual(len(i2.operands), 2) self.assertEqual(len(i2.operands), 2)
#===----------------------------------------------------------------------=== #===-----------------------------------------------------------===
# show test_function # show test_function
logging.debug("Examining test_function `test_test_func':") logging.debug("Examining test_function `test_test_func':")
@ -89,4 +82,3 @@ class TestOperands(unittest.TestCase):
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()