[pypy-svn] r8196 - pypy/branch/src-pytest/pypy/tool

[pedronis at codespeak.net]

Author: pedronis
Date: Mon Jan 10 16:35:12 2005
New Revision: 8196

Modified:
   pypy/branch/src-pytest/pypy/tool/utestconvert.py
Log:
transform raises to py.test.raises was a bad idea (tm) because
for app-level tests raises itself is added as a builtin directly.



Modified: pypy/branch/src-pytest/pypy/tool/utestconvert.py
==============================================================================
--- pypy/branch/src-pytest/pypy/tool/utestconvert.py	(original)
+++ pypy/branch/src-pytest/pypy/tool/utestconvert.py	Mon Jan 10 16:35:12 2005
@@ -11,7 +11,7 @@
 #  function.
 
 # Old Unittest Name             new name         operator  # of args
-d['assertRaises']           = ('py.test.raises',               '', ['Any'])
+d['assertRaises']           = ('raises',               '', ['Any'])
 d['fail']                   = ('raise AssertionError', '', [0,1])
 d['assert_']                = ('assert',               '', [1,2])
 d['failIf']                 = ('assert not',           '', [1,2])