[py-svn] r35652 - in py/dist/py: rest test/rsession test/rsession/testing

[fijal at codespeak.net]

Author: fijal
Date: Tue Dec 12 21:10:52 2006
New Revision: 35652

Modified:
   py/dist/py/rest/convert.py
   py/dist/py/test/rsession/testing/test_web.py
   py/dist/py/test/rsession/web.py
Log:
Fixed (I hope) last few issues with failing tests (at least on my machine)


Modified: py/dist/py/rest/convert.py
==============================================================================
--- py/dist/py/rest/convert.py	(original)
+++ py/dist/py/rest/convert.py	Tue Dec 12 21:10:52 2006
@@ -16,9 +16,9 @@
         raise SystemExit("neither ps2eps nor ps2epsi found")
     try:
         eps = ps.new(ext=".eps")
-        py.process.cmdexec("ERROR: ps2epsi %s %s" % (ps, eps))
+        py.process.cmdexec("ps2epsi %s %s" % (ps, eps))
     except ExecutionFailed:
-        py.process.cmdexec("ERROR: ps2eps -l -f %s" % ps)
+        py.process.cmdexec("ps2eps -l -f %s" % ps)
 
 def ps2pdf(ps, compat_level="1.2"):
     if not is_on_path("gs"):

Modified: py/dist/py/test/rsession/testing/test_web.py
==============================================================================
--- py/dist/py/test/rsession/testing/test_web.py	(original)
+++ py/dist/py/test/rsession/testing/test_web.py	Tue Dec 12 21:10:52 2006
@@ -24,7 +24,7 @@
 
 def test_js_generate():
     from py.__.test.rsession import webjs
-    from py.__.test.rsession.web import FUNCTION_LIST
+    from py.__.test.rsession.web import FUNCTION_LIST, IMPORTED_PYPY
     
     source = rpython2javascript(webjs, FUNCTION_LIST)
     assert source

Modified: py/dist/py/test/rsession/web.py
==============================================================================
--- py/dist/py/test/rsession/web.py	(original)
+++ py/dist/py/test/rsession/web.py	Tue Dec 12 21:10:52 2006
@@ -30,8 +30,11 @@
     #    replace("'", "\\'").replace(" ", " ").replace("\n", "<br/>")
 
 try:
-    if not session_options.import_pypy:
-        raise ImportError
+    try:
+        if not session_options.import_pypy:
+            raise ImportError
+    except NotImplementedError:
+        pass
     from pypy.rpython.ootypesystem.bltregistry import MethodDesc, BasicExternal,\
                                                       described
     from pypy.translator.js.main import rpython2javascript