diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-09-14 11:46:01 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-09-14 11:46:01 +1200 |
| commit | 17868f61a98cb97e6b17ee58e6211e4fa89e62d4 (patch) | |
| tree | 090e17a6753e59088457ab5424dd45908dac0a9f /test | |
| parent | 81e3a6e8e661b212bf45fb37623556f2793d2184 (diff) | |
| download | mitmproxy-17868f61a98cb97e6b17ee58e6211e4fa89e62d4.tar.gz mitmproxy-17868f61a98cb97e6b17ee58e6211e4fa89e62d4.tar.bz2 mitmproxy-17868f61a98cb97e6b17ee58e6211e4fa89e62d4.zip | |
Remove external app option, make tick timeout explicit
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_flow.py | 6 | ||||
| -rw-r--r-- | test/tservers.py | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/test/test_flow.py b/test/test_flow.py index a297bf5f..cb899e2a 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -103,7 +103,7 @@ class TestClientPlaybackState: q = Queue.Queue() fm.state.clear() - fm.tick(q) + fm.tick(q, timeout=0) fm.stop_client_playback() assert not fm.client_playback @@ -645,7 +645,7 @@ class TestFlowMaster: q = Queue.Queue() assert not fm.state.flow_count() - fm.tick(q) + fm.tick(q, 0) assert fm.state.flow_count() f.error = Error("error") @@ -673,7 +673,7 @@ class TestFlowMaster: fm.start_server_playback(pb, False, [], True, False) q = Queue.Queue() - fm.tick(q) + fm.tick(q, 0) assert fm.should_exit.is_set() fm.stop_server_playback() diff --git a/test/tservers.py b/test/tservers.py index 2097631e..93c8a80a 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -83,7 +83,6 @@ class ProxTestBase(object): no_upstream_cert = False authenticator = None masterclass = TestMaster - externalapp = False certforward = False @classmethod @@ -94,7 +93,7 @@ class ProxTestBase(object): cls.config = ProxyConfig(**cls.get_proxy_config()) tmaster = cls.masterclass(cls.config) - tmaster.start_app(APP_HOST, APP_PORT, cls.externalapp) + tmaster.start_app(APP_HOST, APP_PORT) cls.proxy = ProxyThread(tmaster) cls.proxy.start() |