Author: Matti Picus <[email protected]>
Branch: release-5.x
Changeset: r84946:1123f6abacd1
Date: 2016-06-05 22:50 +0300
http://bitbucket.org/pypy/pypy/changeset/1123f6abacd1/
Log: fix merge
diff --git a/pypy/module/select/test/test_epoll.py
b/pypy/module/select/test/test_epoll.py
--- a/pypy/module/select/test/test_epoll.py
+++ b/pypy/module/select/test/test_epoll.py
@@ -20,10 +20,6 @@
self.w_sockets = self.space.wrap([])
if platform.machine().startswith('arm'):
self.w_timeout = self.space.wrap(0.06)
- if platform.machine().startswith('s390x'):
- # s390x is not slow, but it seems there is one case when epoll
- # modify method is called that takes longer on s390x
- self.w_timeout = self.space.wrap(0.06)
else:
self.w_timeout = self.space.wrap(0.02)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
