[pypy-svn] r63125 - pypy/trunk/pypy/objspace/std/test

[pedronis at codespeak.net]

Author: pedronis
Date: Fri Mar 20 11:44:46 2009
New Revision: 63125

Modified:
   pypy/trunk/pypy/objspace/std/test/test_stringobject.py
Log:
(iko, pedronis)

adjust the test consistently with what we did for unicode instead of skipping it



Modified: pypy/trunk/pypy/objspace/std/test/test_stringobject.py
==============================================================================
--- pypy/trunk/pypy/objspace/std/test/test_stringobject.py	(original)
+++ pypy/trunk/pypy/objspace/std/test/test_stringobject.py	Fri Mar 20 11:44:46 2009
@@ -372,11 +372,10 @@
         assert ''.expandtabs() ==''
 
     def test_expandtabs_overflows_gracefully(self):
-        skip("XXX fix me")
         import sys
         if sys.maxint > (1 << 32):
             skip("Wrong platform")
-        raises(OverflowError, 't\tt\t'.expandtabs, sys.maxint)
+        raises((MemoryError, OverflowError), 't\tt\t'.expandtabs, sys.maxint)
 
     def test_splitlines(self):
         s = ""