Remove test handlers by using taddons.RecordingMaster

This also means expanding and tweaking the recording master API, which we
reflect through the current test suite

1 files changed, 13 insertions, 4 deletions

diff --git a/mitmproxy/test/taddons.py b/mitmproxy/test/taddons.py
index c3b65e92..29ae7aa9 100644
--- a/mitmproxy/test/taddons.py
+++ b/mitmproxy/test/taddons.py
@@ -12,7 +12,10 @@ class _AddonWrapper:
         self.addons = addons
 
     def trigger(self, event, *args, **kwargs):
-        self.master.events.append((event, args, kwargs))
+        if event == "log":
+            self.master.logs.append(args[0])
+        else:
+            self.master.events.append((event, args, kwargs))
         return self.addons.trigger(event, *args, **kwargs)
 
     def __getattr__(self, attr):
@@ -26,13 +29,19 @@ class RecordingMaster(mitmproxy.master.Master):
         self.events = []
         self.logs = []
 
+    def has_log(self, txt, level=None):
+        for i in self.logs:
+            if level and i.level != level:
+                continue
+            if txt.lower() in i.msg.lower():
+                return True
+        return False
+
     def has_event(self, name):
         for i in self.events:
             if i[0] == name:
                 return True
-
-    def add_log(self, e, level):
-        self.logs.append((level, e))
+        return False
 
     def clear(self):
         self.logs = []