diff options
| author | Vyacheslav Bakhmutov <m0sth8@yandex-team.ru> | 2014-06-13 14:14:55 +0700 |
|---|---|---|
| committer | Vyacheslav Bakhmutov <m0sth8@yandex-team.ru> | 2014-06-13 14:14:55 +0700 |
| commit | b7c1d057828054a7e8d5f9ccf2c3c93ca8888ed3 (patch) | |
| tree | 1b9dca008c5b1be260b74fce024b620b00dd7cc6 /test | |
| parent | 00fd243810954b1ea7c108482513a7e92f2e8000 (diff) | |
| download | mitmproxy-b7c1d057828054a7e8d5f9ccf2c3c93ca8888ed3.tar.gz mitmproxy-b7c1d057828054a7e8d5f9ccf2c3c93ca8888ed3.tar.bz2 mitmproxy-b7c1d057828054a7e8d5f9ccf2c3c93ca8888ed3.zip | |
Remove global should_exit and fix tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_flow.py | 3 | ||||
| -rw-r--r-- | test/tservers.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/test_flow.py b/test/test_flow.py index 2365c08c..89013003 100644 --- a/test/test_flow.py +++ b/test/test_flow.py @@ -672,7 +672,6 @@ class TestFlowMaster: fm.handle_error(f.error) def test_server_playback(self): - controller.should_exit = False s = flow.State() f = tutils.tflow() @@ -695,7 +694,7 @@ class TestFlowMaster: fm.start_server_playback(pb, False, [], True, False) q = Queue.Queue() fm.tick(q) - assert controller.should_exit + assert fm.should_exit.is_set() fm.stop_server_playback() assert not fm.server_playback diff --git a/test/tservers.py b/test/tservers.py index 7548ebc4..146dd13d 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -283,7 +283,7 @@ class ChainProxTest(ProxTestBase): def teardownAll(cls): super(ChainProxTest, cls).teardownAll() for p in cls.chain: - p.tmaster.server.shutdown() + p.tmaster.shutdown() def setUp(self): super(ChainProxTest, self).setUp() |