Author: Brian Kearns <[email protected]>
Branch:
Changeset: r59535:36abd0dd07d4
Date: 2012-12-21 22:29 -0500
http://bitbucket.org/pypy/pypy/changeset/36abd0dd07d4/
Log: fix test_fork for kill-faking changes
diff --git a/pypy/module/thread/test/support.py
b/pypy/module/thread/test/support.py
--- a/pypy/module/thread/test/support.py
+++ b/pypy/module/thread/test/support.py
@@ -49,26 +49,28 @@
return
adaptivedelay *= 1.05
print '*** timed out ***'
+ cls.w_waitfor = plain_waitfor
- cls.w_waitfor = plain_waitfor
+ def py_timeout_killer(self, *args, **kwargs):
+ timeout_killer(*args, **kwargs)
+ cls.w_timeout_killer = cls.space.wrap(py_timeout_killer)
else:
@unwrap_spec(delay=int)
def py_waitfor(space, w_condition, delay=1):
waitfor(space, w_condition, delay)
+ cls.w_waitfor = cls.space.wrap(interp2app(py_waitfor))
- cls.w_waitfor = cls.space.wrap(interp2app(py_waitfor))
+ def py_timeout_killer(space, __args__):
+ args_w, kwargs_w = __args__.unpack()
+ args = map(space.unwrap, args_w)
+ kwargs = dict([
+ (k, space.unwrap(v))
+ for k, v in kwargs_w.iteritems()
+ ])
+ timeout_killer(*args, **kwargs)
+ cls.w_timeout_killer =
cls.space.wrap(interp2app(py_timeout_killer))
+
cls.w_busywait = cls.space.appexec([], """():
import time
return time.sleep
""")
-
- def py_timeout_killer(space, __args__):
- args_w, kwargs_w = __args__.unpack()
- args = map(space.unwrap, args_w)
- kwargs = dict([
- (k, space.unwrap(v))
- for k, v in kwargs_w.iteritems()
- ])
- timeout_killer(*args, **kwargs)
-
- cls.w_timeout_killer = cls.space.wrap(interp2app(py_timeout_killer))
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
