From b7afcb5dc2007ce451161e513d3e55d4cc91379e Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Thu, 27 Apr 2017 15:58:54 +1200
Subject: addons.streamfile -> addons.save

Options:

    streamfile -> save_stream_file
    streamfile_filter -> save_stream_filter
---
 test/mitmproxy/addons/test_save.py       | 62 ++++++++++++++++++++++++++++++++
 test/mitmproxy/addons/test_streamfile.py | 62 --------------------------------
 2 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 test/mitmproxy/addons/test_save.py
 delete mode 100644 test/mitmproxy/addons/test_streamfile.py

(limited to 'test')

diff --git a/test/mitmproxy/addons/test_save.py b/test/mitmproxy/addons/test_save.py
new file mode 100644
index 00000000..fcd2feab
--- /dev/null
+++ b/test/mitmproxy/addons/test_save.py
@@ -0,0 +1,62 @@
+import pytest
+
+from mitmproxy.test import taddons
+from mitmproxy.test import tflow
+
+from mitmproxy import io
+from mitmproxy import exceptions
+from mitmproxy import options
+from mitmproxy.addons import save
+
+
+def test_configure(tmpdir):
+    sa = save.Save()
+    with taddons.context(options=options.Options()) as tctx:
+        with pytest.raises(exceptions.OptionsError):
+            tctx.configure(sa, save_stream_file=str(tmpdir))
+        with pytest.raises(Exception, match="Invalid filter"):
+            tctx.configure(
+                sa, save_stream_file=str(tmpdir.join("foo")), save_stream_filter="~~"
+            )
+        tctx.configure(sa, save_stream_filter="foo")
+        assert sa.filt
+        tctx.configure(sa, save_stream_filter=None)
+        assert not sa.filt
+
+
+def rd(p):
+    x = io.FlowReader(open(p, "rb"))
+    return list(x.stream())
+
+
+def test_tcp(tmpdir):
+    sa = save.Save()
+    with taddons.context() as tctx:
+        p = str(tmpdir.join("foo"))
+        tctx.configure(sa, save_stream_file=p)
+
+        tt = tflow.ttcpflow()
+        sa.tcp_start(tt)
+        sa.tcp_end(tt)
+        tctx.configure(sa, save_stream_file=None)
+        assert rd(p)
+
+
+def test_simple(tmpdir):
+    sa = save.Save()
+    with taddons.context() as tctx:
+        p = str(tmpdir.join("foo"))
+
+        tctx.configure(sa, save_stream_file=p)
+
+        f = tflow.tflow(resp=True)
+        sa.request(f)
+        sa.response(f)
+        tctx.configure(sa, save_stream_file=None)
+        assert rd(p)[0].response
+
+        tctx.configure(sa, save_stream_file="+" + p)
+        f = tflow.tflow()
+        sa.request(f)
+        tctx.configure(sa, save_stream_file=None)
+        assert not rd(p)[1].response
diff --git a/test/mitmproxy/addons/test_streamfile.py b/test/mitmproxy/addons/test_streamfile.py
deleted file mode 100644
index bcb27c79..00000000
--- a/test/mitmproxy/addons/test_streamfile.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import pytest
-
-from mitmproxy.test import taddons
-from mitmproxy.test import tflow
-
-from mitmproxy import io
-from mitmproxy import exceptions
-from mitmproxy import options
-from mitmproxy.addons import streamfile
-
-
-def test_configure(tmpdir):
-    sa = streamfile.StreamFile()
-    with taddons.context(options=options.Options()) as tctx:
-        with pytest.raises(exceptions.OptionsError):
-            tctx.configure(sa, streamfile=str(tmpdir))
-        with pytest.raises(Exception, match="Invalid filter"):
-            tctx.configure(
-                sa, streamfile=str(tmpdir.join("foo")), streamfile_filter="~~"
-            )
-        tctx.configure(sa, streamfile_filter="foo")
-        assert sa.filt
-        tctx.configure(sa, streamfile_filter=None)
-        assert not sa.filt
-
-
-def rd(p):
-    x = io.FlowReader(open(p, "rb"))
-    return list(x.stream())
-
-
-def test_tcp(tmpdir):
-    sa = streamfile.StreamFile()
-    with taddons.context() as tctx:
-        p = str(tmpdir.join("foo"))
-        tctx.configure(sa, streamfile=p)
-
-        tt = tflow.ttcpflow()
-        sa.tcp_start(tt)
-        sa.tcp_end(tt)
-        tctx.configure(sa, streamfile=None)
-        assert rd(p)
-
-
-def test_simple(tmpdir):
-    sa = streamfile.StreamFile()
-    with taddons.context() as tctx:
-        p = str(tmpdir.join("foo"))
-
-        tctx.configure(sa, streamfile=p)
-
-        f = tflow.tflow(resp=True)
-        sa.request(f)
-        sa.response(f)
-        tctx.configure(sa, streamfile=None)
-        assert rd(p)[0].response
-
-        tctx.configure(sa, streamfile="+" + p)
-        f = tflow.tflow()
-        sa.request(f)
-        tctx.configure(sa, streamfile=None)
-        assert not rd(p)[1].response
-- 
cgit v1.2.3