[pypy-svn] r74902 - in pypy/release/1.2.1.x: . pypy/lib/test2

[fijal at codespeak.net]

Author: fijal
Date: Sat May 29 22:10:16 2010
New Revision: 74902

Modified:
   pypy/release/1.2.1.x/   (props changed)
   pypy/release/1.2.1.x/pypy/lib/test2/test_stackless.py
Log:
Merge 74900 from trunk


Modified: pypy/release/1.2.1.x/pypy/lib/test2/test_stackless.py
==============================================================================
--- pypy/release/1.2.1.x/pypy/lib/test2/test_stackless.py	(original)
+++ pypy/release/1.2.1.x/pypy/lib/test2/test_stackless.py	Sat May 29 22:10:16 2010
@@ -3,7 +3,7 @@
 class AppTest_Stackless:
 
     def setup_class(cls):
-        space = gettestobjspace(usemodules=('_stackless',))
+        space = gettestobjspace(usemodules=('_stackless','_socket'))
         cls.space = space
         # cannot test the unpickle part on top of py.py
         cls.w_can_unpickle = space.wrap(bool(option.runappdirect))