[pypy-commit] pypy default: fix this test on older cpythons

bdkearns noreply at buildbot.pypy.org
Fri Aug 29 19:15:47 CEST 2014


Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r73180:48a6c8cd92f1
Date: 2014-08-29 13:15 -0400
http://bitbucket.org/pypy/pypy/changeset/48a6c8cd92f1/

Log:	fix this test on older cpythons

diff --git a/rpython/rlib/test/test_rfile.py b/rpython/rlib/test/test_rfile.py
--- a/rpython/rlib/test/test_rfile.py
+++ b/rpython/rlib/test/test_rfile.py
@@ -23,7 +23,7 @@
 
     def test_open_errors(self):
         def f(exc):
-            def g():
+            def g(run):
                 try:
                     open('zzz', 'badmode')
                 except ValueError:
@@ -61,17 +61,18 @@
                     assert os.name == 'nt' and e.errno == errno.EACCES
                 else:
                     assert os.name != 'nt'
-                    try:
-                        os.fdopen(fd)
-                    except exc as e:
-                        assert e.errno == errno.EISDIR
-                    else:
-                        assert False
+                    if run:
+                        try:
+                            os.fdopen(fd)
+                        except exc as e:
+                            assert e.errno == errno.EISDIR
+                        else:
+                            assert False
                     os.close(fd)
             return g
 
-        f(IOError)()
-        self.interpret(f(OSError), [])
+        f(IOError)(sys.version_info >= (2, 7, 9))
+        self.interpret(f(OSError), [True])
 
     @py.test.mark.skipif("sys.platform == 'win32'")
     # http://msdn.microsoft.com/en-us/library/86cebhfs.aspx


More information about the pypy-commit mailing list