From f4813d56492a32ef7856002c8be25cf7012bab4e Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sat, 28 May 2016 12:38:07 +1200
Subject: Make @controller.handler inheritance-friendly

Use this to adapt mitmweb and mitproxy console
---
 test/mitmproxy/test_flow.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py
index 62f23ac8..da8b8ddd 100644
--- a/test/mitmproxy/test_flow.py
+++ b/test/mitmproxy/test_flow.py
@@ -470,10 +470,7 @@ class TestFlow(object):
         fm = flow.FlowMaster(None, s)
 
         f = tutils.tflow()
-        fm.handle_request(f)
-
-        f = tutils.tflow()
-        fm.handle_request(f)
+        f.intercept(fm)
 
         s.killall(fm)
         for i in s.view:
-- 
cgit v1.2.3