diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-07-03 02:20:38 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-07-03 02:20:38 +0200 |
| commit | df11595fad287a8ffdecd2ccc18b27478925c5b4 (patch) | |
| tree | 9460f817c84425ce313882e4fe8595e0a0c54e35 /test | |
| parent | c039e4a2e322ee4e0a173f164be598dc630d3579 (diff) | |
| parent | b7c1d057828054a7e8d5f9ccf2c3c93ca8888ed3 (diff) | |
| download | mitmproxy-df11595fad287a8ffdecd2ccc18b27478925c5b4.tar.gz mitmproxy-df11595fad287a8ffdecd2ccc18b27478925c5b4.tar.bz2 mitmproxy-df11595fad287a8ffdecd2ccc18b27478925c5b4.zip | |
Merge pull request #286 from m0sth8/remove_global_should_exit
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() |