[pypy-svn] r9237 - pypy/dist/lib-python-2.3.4/test

[hpk at codespeak.net]

Author: hpk
Date: Tue Feb 15 16:22:11 2005
New Revision: 9237

Modified:
   pypy/dist/lib-python-2.3.4/test/pypy_unittest.py
Log:
use py.test's 'raises' again because underlying 
problems have been fixed (test_builtin.py passes
with py.test) 



Modified: pypy/dist/lib-python-2.3.4/test/pypy_unittest.py
==============================================================================
--- pypy/dist/lib-python-2.3.4/test/pypy_unittest.py	(original)
+++ pypy/dist/lib-python-2.3.4/test/pypy_unittest.py	Tue Feb 15 16:22:11 2005
@@ -40,13 +40,7 @@
         assert False, msg
         
     def assertRaises(self, exc, call, *args, **kwargs): 
-        # Work around problem with py.test's raises
-        # raises(exc, call, *args, **kwargs) 
-        try:
-            call(*args, **kwargs)
-        except exc:
-            return
-        raise AssertionError('DID NOT RAISE')
+        raises(exc, call, *args, **kwargs) 
 
     def assertAlmostEqual(self, x, y, places=7, msg=None):
         if msg is None: