diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 12:01:46 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 12:01:46 +1200 |
| commit | e4f043f69c9528e08403cb9075cf5c182be82aae (patch) | |
| tree | 335c4e3e6d354fa89e24d3a5d1766346558e2c32 /test | |
| parent | ed415877d48251774012bd6aad4be91e9d558b79 (diff) | |
| download | mitmproxy-e4f043f69c9528e08403cb9075cf5c182be82aae.tar.gz mitmproxy-e4f043f69c9528e08403cb9075cf5c182be82aae.tar.bz2 mitmproxy-e4f043f69c9528e08403cb9075cf5c182be82aae.zip | |
Flatten ServerMaster into Master
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_controller.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/mitmproxy/test_controller.py b/test/mitmproxy/test_controller.py index c9a8e2f4..fbbebaa6 100644 --- a/test/mitmproxy/test_controller.py +++ b/test/mitmproxy/test_controller.py @@ -16,7 +16,6 @@ class TMsg: class TestMaster(object): def test_simple(self): - class DummyMaster(controller.Master): @controller.handler def handle_panic(self, _): @@ -34,10 +33,8 @@ class TestMaster(object): m.run() assert m.should_exit.is_set() - -class TestServerMaster(object): - def test_simple(self): - m = controller.ServerMaster() + def test_server_simple(self): + m = controller.Master() s = DummyServer(None) m.add_server(s) m.start() |