aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-05-29 12:15:52 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-05-29 12:15:52 +1200
commit8bb9285678cf4acd9cd5ea6ed8e15c4dae2490f8 (patch)
treecdf18b8f2fd4fd70d21a7eabd8186c49156409bf /test
parent9a32402a3970ca8978d08d184d4fde4d395cd056 (diff)
downloadmitmproxy-8bb9285678cf4acd9cd5ea6ed8e15c4dae2490f8.tar.gz
mitmproxy-8bb9285678cf4acd9cd5ea6ed8e15c4dae2490f8.tar.bz2
mitmproxy-8bb9285678cf4acd9cd5ea6ed8e15c4dae2490f8.zip
Explicitly list all events
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_controller.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/mitmproxy/test_controller.py b/test/mitmproxy/test_controller.py
index fbbebaa6..4b8656da 100644
--- a/test/mitmproxy/test_controller.py
+++ b/test/mitmproxy/test_controller.py
@@ -18,7 +18,7 @@ class TestMaster(object):
def test_simple(self):
class DummyMaster(controller.Master):
@controller.handler
- def handle_panic(self, _):
+ def handle_log(self, _):
m.should_exit.set()
def tick(self, timeout):
@@ -29,7 +29,7 @@ class TestMaster(object):
assert not m.should_exit.is_set()
msg = TMsg()
msg.reply = controller.DummyReply()
- m.event_queue.put(("panic", msg))
+ m.event_queue.put(("log", msg))
m.run()
assert m.should_exit.is_set()