Merge pull request #3739 from gergesh/add-flow-to-contentview-metadata

Add flow to ContentView metadata

2 files changed, 8 insertions, 6 deletions

diff --git a/test/mitmproxy/addons/test_dumper.py b/test/mitmproxy/addons/test_dumper.py
index 7a41c7b9..841e2a01 100644
--- a/test/mitmproxy/addons/test_dumper.py
+++ b/test/mitmproxy/addons/test_dumper.py
@@ -123,7 +123,7 @@ def test_echo_body():
     d = dumper.Dumper(sio, sio_err)
     with taddons.context(d) as ctx:
         ctx.configure(d, flow_detail=3)
-        d._echo_message(f.response)
+        d._echo_message(f.response, f)
         t = sio.getvalue()
         assert "cut off" in t
 
diff --git a/test/mitmproxy/contentviews/test_api.py b/test/mitmproxy/contentviews/test_api.py
index 3fc06d7c..82fd0672 100644
--- a/test/mitmproxy/contentviews/test_api.py
+++ b/test/mitmproxy/contentviews/test_api.py
@@ -5,6 +5,7 @@ from mitmproxy import contentviews
 from mitmproxy.exceptions import ContentViewException
 from mitmproxy.net.http import Headers
 from mitmproxy.test import tutils
+from mitmproxy.test import tflow
 
 
 class TestContentView(contentviews.View):
@@ -60,21 +61,22 @@ def test_get_content_view():
 
 
 def test_get_message_content_view():
+    f = tflow.tflow()
     r = tutils.treq()
-    desc, lines, err = contentviews.get_message_content_view("raw", r)
+    desc, lines, err = contentviews.get_message_content_view("raw", r, f)
     assert desc == "Raw"
 
-    desc, lines, err = contentviews.get_message_content_view("unknown", r)
+    desc, lines, err = contentviews.get_message_content_view("unknown", r, f)
     assert desc == "Raw"
 
     r.encode("gzip")
-    desc, lines, err = contentviews.get_message_content_view("raw", r)
+    desc, lines, err = contentviews.get_message_content_view("raw", r, f)
     assert desc == "[decoded gzip] Raw"
 
     r.headers["content-encoding"] = "deflate"
-    desc, lines, err = contentviews.get_message_content_view("raw", r)
+    desc, lines, err = contentviews.get_message_content_view("raw", r, f)
     assert desc == "[cannot decode] Raw"
 
     r.content = None
-    desc, lines, err = contentviews.get_message_content_view("raw", r)
+    desc, lines, err = contentviews.get_message_content_view("raw", r, f)
     assert list(lines) == [[("error", "content missing")]]