From 9bf1d300d8f4f1c258df5c1bb308546a81ee4df0 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 17 Jul 2016 16:07:29 +1200
Subject: Some work on stream-to-file

- stream -> filestreamer throughout
- move active_flows set into FileStreamer addon
---
 test/mitmproxy/builtins/test_filestreamer.py | 46 ++++++++++++++++++++++++++++
 test/mitmproxy/builtins/test_stream.py       | 46 ----------------------------
 2 files changed, 46 insertions(+), 46 deletions(-)
 create mode 100644 test/mitmproxy/builtins/test_filestreamer.py
 delete mode 100644 test/mitmproxy/builtins/test_stream.py

(limited to 'test')

diff --git a/test/mitmproxy/builtins/test_filestreamer.py b/test/mitmproxy/builtins/test_filestreamer.py
new file mode 100644
index 00000000..002006b7
--- /dev/null
+++ b/test/mitmproxy/builtins/test_filestreamer.py
@@ -0,0 +1,46 @@
+from __future__ import absolute_import, print_function, division
+
+from .. import tutils, mastertest
+
+import os.path
+
+from mitmproxy.builtins import filestreamer
+from mitmproxy.flow import master, FlowReader
+from mitmproxy.flow import state
+from mitmproxy.flow import options
+
+
+class TestStream(mastertest.MasterTest):
+    def test_stream(self):
+        with tutils.tmpdir() as tdir:
+            p = os.path.join(tdir, "foo")
+
+            def r():
+                r = FlowReader(open(p, "rb"))
+                return list(r.stream())
+
+            s = state.State()
+            m = master.FlowMaster(
+                options.Options(
+                    outfile = (p, "wb")
+                ),
+                None,
+                s
+            )
+            sa = filestreamer.FileStreamer()
+
+            m.addons.add(sa)
+            f = tutils.tflow(resp=True)
+            self.invoke(m, "request", f)
+            self.invoke(m, "response", f)
+            m.addons.remove(sa)
+
+            assert r()[0].response
+
+            m.options.outfile = (p, "ab")
+
+            m.addons.add(sa)
+            f = tutils.tflow()
+            self.invoke(m, "request", f)
+            m.addons.remove(sa)
+            assert not r()[1].response
diff --git a/test/mitmproxy/builtins/test_stream.py b/test/mitmproxy/builtins/test_stream.py
deleted file mode 100644
index edaa41d2..00000000
--- a/test/mitmproxy/builtins/test_stream.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from __future__ import absolute_import, print_function, division
-
-from .. import tutils, mastertest
-
-import os.path
-
-from mitmproxy.builtins import stream
-from mitmproxy.flow import master, FlowReader
-from mitmproxy.flow import state
-from mitmproxy.flow import options
-
-
-class TestStream(mastertest.MasterTest):
-    def test_stream(self):
-        with tutils.tmpdir() as tdir:
-            p = os.path.join(tdir, "foo")
-
-            def r():
-                r = FlowReader(open(p, "rb"))
-                return list(r.stream())
-
-            s = state.State()
-            m = master.FlowMaster(
-                options.Options(
-                    outfile = (p, "wb")
-                ),
-                None,
-                s
-            )
-            sa = stream.Stream()
-
-            m.addons.add(sa)
-            f = tutils.tflow(resp=True)
-            self.invoke(m, "request", f)
-            self.invoke(m, "response", f)
-            m.addons.remove(sa)
-
-            assert r()[0].response
-
-            m.options.outfile = (p, "ab")
-
-            m.addons.add(sa)
-            f = tutils.tflow()
-            self.invoke(m, "request", f)
-            m.addons.remove(sa)
-            assert not r()[1].response
-- 
cgit v1.2.3