From 5c45a90ce961d740e59644f4de0f8ffe97a5706c Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Mon, 24 Jul 2017 20:35:43 +0800 Subject: [web] Update tests. --- test/mitmproxy/test_optmanager.py | 4 ++++ test/mitmproxy/tools/web/test_app.py | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/mitmproxy/test_optmanager.py b/test/mitmproxy/test_optmanager.py index 7b4ffb8b..3b38162f 100644 --- a/test/mitmproxy/test_optmanager.py +++ b/test/mitmproxy/test_optmanager.py @@ -285,6 +285,10 @@ def test_saving(tmpdir): optmanager.load_paths(o, dst) assert o.three == "foo" + o2 = TD2() + o2.three = "foo" + assert(optmanager.save(o2, None, defaults=False)) == "three: foo\n" + with open(dst, 'a') as f: f.write("foobar: '123'") assert optmanager.load_paths(o, dst) == {"foobar": "123"} diff --git a/test/mitmproxy/tools/web/test_app.py b/test/mitmproxy/tools/web/test_app.py index bb439b34..bb0b1907 100644 --- a/test/mitmproxy/tools/web/test_app.py +++ b/test/mitmproxy/tools/web/test_app.py @@ -263,6 +263,18 @@ class TestApp(tornado.testing.AsyncHTTPTestCase): assert self.put_json("/options", {"wtf": True}).code == 400 assert self.put_json("/options", {"anticache": "foo"}).code == 400 + def test_option_dump(self): + resp = self.fetch("/options/dump") + assert b"http2: false" in resp.body + + assert self.fetch("/options/dump", method="POST", body=b"http2: true").code == 200 + j = json(self.fetch("/options")) + assert j["http2"]["value"] + + resp = self.fetch("/options/dump", method="POST", body=b"wtf: true") + assert resp.code == 400 + assert resp.body == b"'Unknown options: wtf'" + def test_err(self): with mock.patch("mitmproxy.tools.web.app.IndexHandler.get") as f: f.side_effect = RuntimeError @@ -279,7 +291,6 @@ class TestApp(tornado.testing.AsyncHTTPTestCase): r2 = yield ws_client.read_message() j1 = _json.loads(r1) j2 = _json.loads(r2) - print(j1) response = dict() response[j1['resource']] = j1 response[j2['resource']] = j2 -- cgit v1.2.3 From 4282dc1ac4053d774b0fe6993ae15222fcfe3b3d Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Wed, 26 Jul 2017 15:16:23 +0800 Subject: [web] Update tests. --- test/mitmproxy/tools/test_dump.py | 2 +- test/mitmproxy/tools/web/test_app.py | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/mitmproxy/tools/test_dump.py b/test/mitmproxy/tools/test_dump.py index 69a76d2e..597333af 100644 --- a/test/mitmproxy/tools/test_dump.py +++ b/test/mitmproxy/tools/test_dump.py @@ -12,7 +12,7 @@ from .. import tservers class TestDumpMaster(tservers.MasterTest): def mkmaster(self, flt, **opts): - o = options.Options(view_filter=flt, verbosity=-1, flow_detail=0, **opts) + o = options.Options(view_filter=flt, verbosity='error', flow_detail=0, **opts) m = dump.DumpMaster(o, proxy.DummyServer(), with_termlog=False, with_dumper=False) return m diff --git a/test/mitmproxy/tools/web/test_app.py b/test/mitmproxy/tools/web/test_app.py index bb0b1907..119d7b1d 100644 --- a/test/mitmproxy/tools/web/test_app.py +++ b/test/mitmproxy/tools/web/test_app.py @@ -264,16 +264,7 @@ class TestApp(tornado.testing.AsyncHTTPTestCase): assert self.put_json("/options", {"anticache": "foo"}).code == 400 def test_option_dump(self): - resp = self.fetch("/options/dump") - assert b"http2: false" in resp.body - - assert self.fetch("/options/dump", method="POST", body=b"http2: true").code == 200 - j = json(self.fetch("/options")) - assert j["http2"]["value"] - - resp = self.fetch("/options/dump", method="POST", body=b"wtf: true") - assert resp.code == 400 - assert resp.body == b"'Unknown options: wtf'" + assert self.fetch("/options/dump", method="POST").code == 200 def test_err(self): with mock.patch("mitmproxy.tools.web.app.IndexHandler.get") as f: -- cgit v1.2.3 From 108ef035855377644ab904e3bba65f7f6512f0ed Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Wed, 26 Jul 2017 15:42:26 +0800 Subject: [web] Fix tests. --- test/mitmproxy/test_optmanager.py | 4 ---- test/mitmproxy/tools/test_dump.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'test') diff --git a/test/mitmproxy/test_optmanager.py b/test/mitmproxy/test_optmanager.py index 3b38162f..7b4ffb8b 100644 --- a/test/mitmproxy/test_optmanager.py +++ b/test/mitmproxy/test_optmanager.py @@ -285,10 +285,6 @@ def test_saving(tmpdir): optmanager.load_paths(o, dst) assert o.three == "foo" - o2 = TD2() - o2.three = "foo" - assert(optmanager.save(o2, None, defaults=False)) == "three: foo\n" - with open(dst, 'a') as f: f.write("foobar: '123'") assert optmanager.load_paths(o, dst) == {"foobar": "123"} diff --git a/test/mitmproxy/tools/test_dump.py b/test/mitmproxy/tools/test_dump.py index 597333af..69a76d2e 100644 --- a/test/mitmproxy/tools/test_dump.py +++ b/test/mitmproxy/tools/test_dump.py @@ -12,7 +12,7 @@ from .. import tservers class TestDumpMaster(tservers.MasterTest): def mkmaster(self, flt, **opts): - o = options.Options(view_filter=flt, verbosity='error', flow_detail=0, **opts) + o = options.Options(view_filter=flt, verbosity=-1, flow_detail=0, **opts) m = dump.DumpMaster(o, proxy.DummyServer(), with_termlog=False, with_dumper=False) return m -- cgit v1.2.3 From 4ab5574e1849ffe85bd9d06d0beb7a40b31a3845 Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Thu, 27 Jul 2017 11:20:37 +0800 Subject: [web] Minor Fix for backend. --- test/mitmproxy/tools/web/test_app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/mitmproxy/tools/web/test_app.py b/test/mitmproxy/tools/web/test_app.py index 119d7b1d..4d290284 100644 --- a/test/mitmproxy/tools/web/test_app.py +++ b/test/mitmproxy/tools/web/test_app.py @@ -263,8 +263,8 @@ class TestApp(tornado.testing.AsyncHTTPTestCase): assert self.put_json("/options", {"wtf": True}).code == 400 assert self.put_json("/options", {"anticache": "foo"}).code == 400 - def test_option_dump(self): - assert self.fetch("/options/dump", method="POST").code == 200 + def test_option_save(self): + assert self.fetch("/options/save", method="POST").code == 200 def test_err(self): with mock.patch("mitmproxy.tools.web.app.IndexHandler.get") as f: -- cgit v1.2.3