[pypy-commit] pypy default: fix tests

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r88205:4c405c663a1c
Date: 2016-11-08 11:47 +0100
http://bitbucket.org/pypy/pypy/changeset/4c405c663a1c/

Log:	fix tests

diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/interpreter/error.py
+++ b/pypy/interpreter/error.py
@@ -543,6 +543,9 @@
         return OperationError(space.w_KeyboardInterrupt, space.w_None)
     except MemoryError:
         return OperationError(space.w_MemoryError, space.w_None)
+    except NotImplementedError:   # not on top of pypy! tests only
+        return OperationError(space.w_SystemError,
+                              space.wrap("NotImplementedError"))
     except rstackovf.StackOverflow as e:
         rstackovf.check_stack_overflow()
         return oefmt(space.w_RuntimeError,
diff --git a/pypy/module/gc/test/test_app_referents.py b/pypy/module/gc/test/test_app_referents.py
--- a/pypy/module/gc/test/test_app_referents.py
+++ b/pypy/module/gc/test/test_app_referents.py
@@ -4,12 +4,13 @@
 
 def test_interface_to_dump_rpy_heap_str(space):
     filename = str(udir.join('dump_rpy_heap.str'))
-    try:
-        space.appexec([space.wrap(filename)], """(filename):
-            import gc
-            gc.dump_rpy_heap(filename)""")
-    except NotImplementedError:
-        pass
+    space.appexec([space.wrap(filename)], """(filename):
+        import gc
+        try:
+            gc.dump_rpy_heap(filename)
+        except SystemError:
+            pass
+    """)
     assert os.path.exists(filename)
 
 def test_interface_to_dump_rpy_heap_file(space):
@@ -20,20 +21,22 @@
             f.write('X')
             return f""")
     assert os.path.getsize(filename) == 0   # the 'X' was not flushed yet
-    try:
-        space.appexec([w_f], """(f):
-            import gc
-            gc.dump_rpy_heap(f)""")
-    except NotImplementedError:
-        pass
+    space.appexec([w_f], """(f):
+        import gc
+        try:
+            gc.dump_rpy_heap(f)
+        except SystemError:
+            pass
+    """)
     assert os.path.getsize(filename) == 1   # the 'X' was flushed here
 
 def test_interface_to_dump_rpy_heap_fd(space):
     filename = str(udir.join('dump_rpy_heap.fd'))
     f = open(filename, 'wb')
-    try:
-        space.appexec([space.wrap(f.fileno())], """(fd):
-            import gc
-            gc.dump_rpy_heap(fd)""")
-    except NotImplementedError:
-        pass
+    space.appexec([space.wrap(f.fileno())], """(fd):
+        import gc
+        try:
+            gc.dump_rpy_heap(fd)
+        except SystemError:
+            pass
+    """)