Add except clause to catch script parsing errors (#1929)

2 files changed, 10 insertions, 4 deletions

diff --git a/test/mitmproxy/addons/test_script.py b/test/mitmproxy/addons/test_script.py
index f6fca23e..6e04d49d 100644
--- a/test/mitmproxy/addons/test_script.py
+++ b/test/mitmproxy/addons/test_script.py
@@ -58,10 +58,10 @@ def test_reloadhandler():
 
 class TestParseCommand:
     def test_empty_command(self):
-        with tutils.raises(exceptions.OptionsError):
+        with tutils.raises(ValueError):
             script.parse_command("")
 
-        with tutils.raises(exceptions.OptionsError):
+        with tutils.raises(ValueError):
             script.parse_command("  ")
 
     def test_no_script_file(self):
@@ -203,6 +203,7 @@ class TestScriptLoader:
         evts = [i[1] for i in sc.ns.call_log]
         assert evts == ['start', 'requestheaders', 'request', 'responseheaders', 'response', 'done']
 
+        f = tflow.tflow(resp=True)
         with m.handlecontext():
             tutils.raises(
                 "file not found",
diff --git a/test/mitmproxy/console/test_master.py b/test/mitmproxy/console/test_master.py
index fb3c2527..82cc6f9d 100644
--- a/test/mitmproxy/console/test_master.py
+++ b/test/mitmproxy/console/test_master.py
@@ -4,7 +4,6 @@ from mitmproxy.tools import console
 from mitmproxy import proxy
 from mitmproxy import options
 from mitmproxy.tools.console import common
-
 from .. import mastertest
 
 
@@ -27,7 +26,7 @@ def test_options():
 class TestMaster(mastertest.MasterTest):
     def mkmaster(self, **opts):
         if "verbosity" not in opts:
-            opts["verbosity"] = 0
+            opts["verbosity"] = 1
         o = options.Options(**opts)
         return console.master.ConsoleMaster(o, proxy.DummyServer())
 
@@ -37,6 +36,12 @@ class TestMaster(mastertest.MasterTest):
             self.dummy_cycle(m, 1, b"")
             assert len(m.view) == i
 
+    def test_run_script_once(self):
+        m = self.mkmaster()
+        f = tflow.tflow(resp=True)
+        m.run_script_once("nonexistent", [f])
+        assert "Input error" in str(m.logbuffer[0])
+
     def test_intercept(self):
         """regression test for https://github.com/mitmproxy/mitmproxy/issues/1605"""
         m = self.mkmaster(intercept="~b bar")