diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-21 18:31:30 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-21 18:31:30 +0200 |
| commit | bba5ec7144f0e08d4b26bad2987c6e7f0871b83d (patch) | |
| tree | e462047f6169bd64b6bab99b8d8259bb0697bcf9 /test/test_server.py | |
| parent | 88375ad64aa2f53b9447df1ccd7aa7ee77cb04ef (diff) | |
| download | mitmproxy-bba5ec7144f0e08d4b26bad2987c6e7f0871b83d.tar.gz mitmproxy-bba5ec7144f0e08d4b26bad2987c6e7f0871b83d.tar.bz2 mitmproxy-bba5ec7144f0e08d4b26bad2987c6e7f0871b83d.zip | |
experimental: run tests using py.tests
Diffstat (limited to 'test/test_server.py')
| -rw-r--r-- | test/test_server.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/test_server.py b/test/test_server.py index c81a2843..5f644c96 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -124,6 +124,8 @@ class TcpMixin: i2 = self.pathod("306") self._ignore_off() + self.master.masterq.join() + assert n.status_code == 304 assert i.status_code == 305 assert i2.status_code == 306 @@ -168,6 +170,8 @@ class TcpMixin: i2 = self.pathod("306") self._tcpproxy_off() + self.master.masterq.join() + assert n.status_code == 304 assert i.status_code == 305 assert i2.status_code == 306 |