4 files changed, 25 insertions, 2 deletions
diff --git a/test/bench/benchmark.py b/test/bench/benchmark.py
index 8d208088..84ec6005 100644
--- a/test/bench/benchmark.py
+++ b/test/bench/benchmark.py
@@ -11,6 +11,15 @@ class Benchmark:
         self.pr = cProfile.Profile()
         self.started = False
 
+        self.resps = 0
+        self.reqs = 0
+
+    def request(self, f):
+        self.reqs += 1
+
+    def response(self, f):
+        self.resps += 1
+
     async def procs(self):
         ctx.log.error("starting benchmark")
         backend = await asyncio.create_subprocess_exec("devd", "-q", "-p", "10001", ".")
@@ -23,6 +32,7 @@ class Benchmark:
         )
         stdout, _ = await traf.communicate()
         open(ctx.options.benchmark_save_path + ".bench", mode="wb").write(stdout)
+        ctx.log.error("Proxy saw %s requests, %s responses" % (self.reqs, self.resps))
         ctx.log.error(stdout.decode("ascii"))
         backend.kill()
         ctx.master.shutdown()
diff --git a/test/bench/run b/test/bench/run-mitmdump
index 9925b578..9925b578 100755
--- a/test/bench/run
+++ b/test/bench/run-mitmdump
diff --git a/test/bench/run-mitmproxy b/test/bench/run-mitmproxy
new file mode 100755
index 00000000..4f1f626e
--- /dev/null
+++ b/test/bench/run-mitmproxy
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+mkdir -p results
+mitmproxy -p0 -q --set benchmark_save_path=./results/mitmproxy -s ./benchmark.py
+\ No newline at end of file
diff --git a/test/mitmproxy/test_optmanager.py b/test/mitmproxy/test_optmanager.py
index 1c49c0b8..4356434b 100644
--- a/test/mitmproxy/test_optmanager.py
+++ b/test/mitmproxy/test_optmanager.py
@@ -70,7 +70,7 @@ def test_defaults():
 def test_required_int():
     o = TO()
     with pytest.raises(exceptions.OptionsError):
-        o.parse_setval("required_int", None)
+        o.parse_setval(o._options["required_int"], None)
 
 
 def test_deepcopy():
@@ -426,4 +426,13 @@ def test_set():
     assert opts.seqstr == []
 
     with pytest.raises(exceptions.OptionsError):
-        opts.set("nonexistent=wobble")
+        opts.set("deferred=wobble")
+
+    opts.set("deferred=wobble", defer=True)
+    assert "deferred" in opts._deferred
+    opts.process_deferred()
+    assert "deferred" in opts._deferred
+    opts.add_option("deferred", str, "default", "help")
+    opts.process_deferred()
+    assert "deferred" not in opts._deferred
+    assert opts.deferred == "wobble"