Fix for #2750 and #2783 (#2809)

2 files changed, 34 insertions, 0 deletions

diff --git a/test/mitmproxy/addons/test_cut.py b/test/mitmproxy/addons/test_cut.py
index c444b8ee..266f9de7 100644
--- a/test/mitmproxy/addons/test_cut.py
+++ b/test/mitmproxy/addons/test_cut.py
@@ -112,6 +112,25 @@ def test_cut_save(tmpdir):
         assert qr(f).splitlines() == [b"GET,content", b"GET,content"]
 
 
+@pytest.mark.parametrize("exception, log_message", [
+    (PermissionError, "Permission denied"),
+    (IsADirectoryError, "Is a directory"),
+    (FileNotFoundError, "No such file or directory")
+])
+def test_cut_save_open(exception, log_message, tmpdir):
+    f = str(tmpdir.join("path"))
+    v = view.View()
+    c = cut.Cut()
+    with taddons.context() as tctx:
+        tctx.master.addons.add(v, c)
+        v.add([tflow.tflow(resp=True)])
+
+        with mock.patch("mitmproxy.addons.cut.open") as m:
+            m.side_effect = exception(log_message)
+            tctx.command(c.save, "@all", "request.method", f)
+            assert tctx.master.has_log(log_message, level="error")
+
+
 def test_cut():
     c = cut.Cut()
     with taddons.context():
diff --git a/test/mitmproxy/addons/test_export.py b/test/mitmproxy/addons/test_export.py
index 233c62d5..4ceb0429 100644
--- a/test/mitmproxy/addons/test_export.py
+++ b/test/mitmproxy/addons/test_export.py
@@ -94,6 +94,21 @@ def test_export(tmpdir):
         os.unlink(f)
 
 
+@pytest.mark.parametrize("exception, log_message", [
+    (PermissionError, "Permission denied"),
+    (IsADirectoryError, "Is a directory"),
+    (FileNotFoundError, "No such file or directory")
+])
+def test_export_open(exception, log_message, tmpdir):
+    f = str(tmpdir.join("path"))
+    e = export.Export()
+    with taddons.context() as tctx:
+        with mock.patch("mitmproxy.addons.export.open") as m:
+            m.side_effect = exception(log_message)
+            e.file("raw", tflow.tflow(resp=True), f)
+            assert tctx.master.has_log(log_message, level="error")
+
+
 def test_clip(tmpdir):
     e = export.Export()
     with taddons.context():