[pypy-svn] r58789 - pypy/dist/pypy/lib/distributed/test

[hpk at codespeak.net]

Author: hpk
Date: Tue Oct  7 21:21:27 2008
New Revision: 58789

Modified:
   pypy/dist/pypy/lib/distributed/test/test_greensock.py
   pypy/dist/pypy/lib/distributed/test/test_socklayer.py
Log:
try to import pygreen, otherwise skip.



Modified: pypy/dist/pypy/lib/distributed/test/test_greensock.py
==============================================================================
--- pypy/dist/pypy/lib/distributed/test/test_greensock.py	(original)
+++ pypy/dist/pypy/lib/distributed/test/test_greensock.py	Tue Oct  7 21:21:27 2008
@@ -2,6 +2,9 @@
 import py
 from pypy.conftest import gettestobjspace, option
 
+def setup_module(mod):
+    py.test.importorskip("pygreen")   # found e.g. in py/trunk/contrib 
+
 class AppTestDistributedGreensock(object):
     def setup_class(cls):
         if not option.runappdirect:
@@ -41,7 +44,7 @@
     def test_remote_call(self):
         from distributed import socklayer
         import sys
-        from py.__.green.greenexecnet import PopenGateway
+        from pygreen.greenexecnet import PopenGateway
         gw = PopenGateway()
         rp = socklayer.spawn_remote_side(self.remote_side_code, gw)
         a = rp.get_remote("a")
@@ -49,8 +52,8 @@
     
     def test_remote_counting(self):
         from distributed import socklayer
-        from py.__.green.greensock2 import allof
-        from py.__.green.greenexecnet import PopenGateway
+        from pygreen.greensock2 import allof
+        from pygreen.greenexecnet import PopenGateway
         gws = [PopenGateway() for i in range(3)]
         rps = [socklayer.spawn_remote_side(self.remote_side_code, gw)
                for gw in gws]

Modified: pypy/dist/pypy/lib/distributed/test/test_socklayer.py
==============================================================================
--- pypy/dist/pypy/lib/distributed/test/test_socklayer.py	(original)
+++ pypy/dist/pypy/lib/distributed/test/test_socklayer.py	Tue Oct  7 21:21:27 2008
@@ -1,6 +1,9 @@
-
+import py
 from pypy.conftest import gettestobjspace
 
+def setup_module(mod):
+    py.test.importorskip("pygreen")   # found e.g. in py/trunk/contrib 
+
 # XXX think how to close the socket
 
 class AppTestSocklayer:
@@ -18,9 +21,9 @@
             import py
         except ImportError:
             skip("pylib not importable")
-        from py.__.green.pipe.gsocket import GreenSocket
+        from pygreen.pipe.gsocke import GreenSocket
         from distributed.socklayer import socket_loop, connect
-        from py.__.green.greensock2 import oneof, allof
+        from pygreen.greensock2 import oneof, allof
 
         def one():
             socket_loop(('127.0.0.1', 21211), {'x':x}, socket=GreenSocket)