diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-04-26 18:41:40 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-04-26 18:41:40 +0200 |
| commit | f96e4957b1f136734ee1207c76aca95be8a2ad6b (patch) | |
| tree | 68971b18911d91a367df89680307ba9cfe3d54cf /test/test_server.py | |
| parent | 79e587fe040be1cefe8637f28e6c2e1a8a50779d (diff) | |
| parent | 1c5277b21fd283a3b58d145c5090f59d657b594d (diff) | |
| download | mitmproxy-f96e4957b1f136734ee1207c76aca95be8a2ad6b.tar.gz mitmproxy-f96e4957b1f136734ee1207c76aca95be8a2ad6b.tar.bz2 mitmproxy-f96e4957b1f136734ee1207c76aca95be8a2ad6b.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'test/test_server.py')
| -rw-r--r-- | test/test_server.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/test_server.py b/test/test_server.py index 26770f29..0f0afd7f 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -205,7 +205,10 @@ class TestHTTP(tservers.HTTPProxTest, CommonMixin, AppMixin): # Now check that the connection is closed as the client specifies p = self.pathoc() assert p.request("get:'%s':h'Connection'='close'"%response) - tutils.raises("disconnect", p.request, "get:'%s'"%response) + # There's a race here, which means we can get any of a number of errors. + # Rather than introduce yet another sleep into the test suite, we just + # relax the Exception specification. + tutils.raises(Exception, p.request, "get:'%s'"%response) def test_reconnect(self): req = "get:'%s/p/200:b@1:da'"%self.server.urlbase |