diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-07-11 07:17:20 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-07-11 07:17:20 +1200 |
| commit | a44a76a7dafb11272c0457c6a719a0d12a0d3ea6 (patch) | |
| tree | f2d2918eb271a45579a2b03697e8907f9ba3f4ea /test/test_server.py | |
| parent | 1d09a558a76042f79bf7a46880d411e0add1494e (diff) | |
| parent | 01b8b0d8764be01fbb1f1dfe4466bb094748435f (diff) | |
| download | mitmproxy-a44a76a7dafb11272c0457c6a719a0d12a0d3ea6.tar.gz mitmproxy-a44a76a7dafb11272c0457c6a719a0d12a0d3ea6.tar.bz2 mitmproxy-a44a76a7dafb11272c0457c6a719a0d12a0d3ea6.zip | |
Merge branch 'master' of github.com:cortesi/mitmproxy
Diffstat (limited to 'test/test_server.py')
| -rw-r--r-- | test/test_server.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/test/test_server.py b/test/test_server.py index 72be976f..86dc0a4a 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -26,20 +26,17 @@ class SanityMixin: l = self.master.state.view[0] assert l.response.code == 304 l.request.path = "/p/305" - rt = self.master.replay_request(l) - rt.join() + rt = self.master.replay_request(l, block=True) assert l.response.code == 305 # Disconnect error l.request.path = "/p/305:d0" - rt = self.master.replay_request(l) - rt.join() + rt = self.master.replay_request(l, block=True) assert l.error # Port error l.request.port = 1 - rt = self.master.replay_request(l) - rt.join() + rt = self.master.replay_request(l, block=True) assert l.error |