[pypy-svn] r35829 - pypy/dist/pypy/lib/app_test

[arigo at codespeak.net]

Author: arigo
Date: Sat Dec 16 11:00:04 2006
New Revision: 35829

Modified:
   pypy/dist/pypy/lib/app_test/test_coroutine.py
   pypy/dist/pypy/lib/app_test/test_stackless.py
Log:
Skip instead of crash if coroutine.py is not importable.


Modified: pypy/dist/pypy/lib/app_test/test_coroutine.py
==============================================================================
--- pypy/dist/pypy/lib/app_test/test_coroutine.py	(original)
+++ pypy/dist/pypy/lib/app_test/test_coroutine.py	Sat Dec 16 11:00:04 2006
@@ -1,7 +1,11 @@
-from pypy.lib.stackless import coroutine
-
 from py.test import skip, raises
 
+try:
+    from pypy.lib.stackless import coroutine
+except ImportError, e:
+    skip('cannot import stackless: %s' % (e,))
+
+
 class Test_Coroutine:
 
     def test_is_zombie(self):

Modified: pypy/dist/pypy/lib/app_test/test_stackless.py
==============================================================================
--- pypy/dist/pypy/lib/app_test/test_stackless.py	(original)
+++ pypy/dist/pypy/lib/app_test/test_stackless.py	Sat Dec 16 11:00:04 2006
@@ -4,16 +4,19 @@
 2. CPython (with the stackless_new module in the path
 3. pypy-c
 """
+from py.test import skip
 try:
     import stackless
     if 'coroutine' in dir(stackless):
         raise ImportError("We are running pypy-c")
     withinit = False
 except ImportError:
-    from pypy.lib import stackless_new as stackless
+    try:
+        from pypy.lib import stackless_new as stackless
+    except ImportError, e:
+        skip('cannot import stackless: %s' % (e,))
     #from pypy.lib import stackless
     withinit = True
-from py.test import skip
 
 class Test_Stackless: