diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-06-08 15:57:29 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-06-08 15:57:29 +1200 |
| commit | 97fdb9ef0ca357265e77857dadab4f7dad4e5bf5 (patch) | |
| tree | c516f35da5f1ce5f673eef364468990b2faf6a8c /test | |
| parent | 3ad73dfb5bf3f027f864af409b82320554ee9144 (diff) | |
| download | mitmproxy-97fdb9ef0ca357265e77857dadab4f7dad4e5bf5.tar.gz mitmproxy-97fdb9ef0ca357265e77857dadab4f7dad4e5bf5.tar.bz2 mitmproxy-97fdb9ef0ca357265e77857dadab4f7dad4e5bf5.zip | |
More timeout improvements
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_pathod.py | 3 | ||||
| -rw-r--r-- | test/tutils.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/test/test_pathod.py b/test/test_pathod.py index 345734bf..f85ef38d 100644 --- a/test/test_pathod.py +++ b/test/test_pathod.py @@ -213,10 +213,9 @@ class CommonTests(tutils.DaemonTests): def test_websocket_frame(self): r, _ = self.pathoc( - ["ws:/p/", "wf:f'wf:b\"test\"'"], + ["ws:/p/", "wf:f'wf:b\"test\"':pa,1"], ws_read_limit=1 ) - print >> sys.stderr, r assert r[1].payload == "test" def test_websocket_frame_reflect_error(self): diff --git a/test/tutils.py b/test/tutils.py index 5988e846..c56c60d4 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -85,11 +85,10 @@ class DaemonTests(object): ("localhost", self.d.port), ssl=ssl, ws_read_limit=ws_read_limit, + timeout = timeout, fp = logfp ) c.connect(connect_to) - if timeout: - c.settimeout(timeout) ret = [] for i in specs: resp = c.request(i) |