From e4f043f69c9528e08403cb9075cf5c182be82aae Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 29 May 2016 12:01:46 +1200
Subject: Flatten ServerMaster into Master

---
 test/mitmproxy/test_controller.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'test')

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()
-- 
cgit v1.2.3