aboutsummaryrefslogtreecommitdiffstats
path: root/test/tutils.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-06-05 16:03:17 +1200
committerAldo Cortesi <aldo@nullcube.com>2015-06-05 16:03:17 +1200
commit7412ec83f55e6a9dcdde84603b88cd67bbf8b04d (patch)
treec66f062afe1c08ef05b714fa26306a243e603994 /test/tutils.py
parentd23691f98c9e421a05db0519e8a19388db3a97be (diff)
downloadmitmproxy-7412ec83f55e6a9dcdde84603b88cd67bbf8b04d.tar.gz
mitmproxy-7412ec83f55e6a9dcdde84603b88cd67bbf8b04d.tar.bz2
mitmproxy-7412ec83f55e6a9dcdde84603b88cd67bbf8b04d.zip
Refactor pathoc message receive to use queues and generators
This gives us a nicer, thread-safe interface.
Diffstat (limited to 'test/tutils.py')
-rw-r--r--test/tutils.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/tutils.py b/test/tutils.py
index dc118bbe..1e33dfe7 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -88,9 +88,12 @@ class DaemonTests(object):
c.settimeout(timeout)
ret = []
for i in specs:
- ret.append(c.request(i))
- return ret
-
+ resp = c.request(i)
+ if resp:
+ ret.append(resp)
+ for frm in c.wait():
+ ret.append(frm)
+ return ret
@contextmanager
def tmpdir(*args, **kwargs):