IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

increase TIMEOUT for waits in tests, fix python3 syntax

Browse Source
This commit is contained in:
holger krekel
2010-10-07 09:00:07 +02:00
parent 9df55b1c60
commit 51815940c2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
testing/test_remote.py
View File

@@ -6,6 +6,8 @@ queue = py.builtin._tryimport("queue", "Queue")
from py.builtin import print_ from py.builtin import print_
import marshal import marshal
WAIT_TIMEOUT = 10.0
def check_marshallable(d): def check_marshallable(d):
try: try:
marshal.dumps(d) marshal.dumps(d)
@@ -41,9 +43,9 @@ class SlaveSetup:
def popevent(self, name=None): def popevent(self, name=None):
while 1: while 1:
if self.use_callback: if self.use_callback:
data = self.events.get(timeout=2) data = self.events.get(timeout=WAIT_TIMEOUT)
else: else:
data = self.slp.channel.receive(timeout=2) data = self.slp.channel.receive(timeout=WAIT_TIMEOUT)
ev = EventCall(data) ev = EventCall(data)
if name is None or ev.name == name: if name is None or ev.name == name:
return ev return ev
@@ -158,7 +160,6 @@ class TestSlaveInteractor:
rep = unserialize_report(ev.name, ev.kwargs['data']) rep = unserialize_report(ev.name, ev.kwargs['data'])
assert rep.skipped assert rep.skipped
ev = slave.popevent("collectionfinish") ev = slave.popevent("collectionfinish")
print ev.kwargs
assert not ev.kwargs['ids'] assert not ev.kwargs['ids']
def test_remote_collect_fail(self, slave): def test_remote_collect_fail(self, slave):