diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-04-20 15:42:33 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-04-20 15:42:33 +1200 |
| commit | 33820d9aeedc58e7d27118a545690571374e48be (patch) | |
| tree | 7af9deabbfd37aa99ad55d0372fa0321da5b4c61 /test | |
| parent | be450cf9db1d819b1023029c8d403f401e010c98 (diff) | |
| download | mitmproxy-33820d9aeedc58e7d27118a545690571374e48be.tar.gz mitmproxy-33820d9aeedc58e7d27118a545690571374e48be.tar.bz2 mitmproxy-33820d9aeedc58e7d27118a545690571374e48be.zip | |
Whitespace, interface refcactoring, sketch websockets language
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_language.py | 6 | ||||
| -rw-r--r-- | test/test_pathoc.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/test_language.py b/test/test_language.py index 25f4eec4..cd7f703e 100644 --- a/test/test_language.py +++ b/test/test_language.py @@ -124,7 +124,9 @@ class TestValueFile: assert v.get_generator(dict(staticdir=t)) v = language.Value.parseString("<path2")[0] - tutils.raises(language.FileAccessDenied, v.get_generator, dict(staticdir=t)) + tutils.raises( + language.FileAccessDenied, v.get_generator, dict(staticdir=t) + ) tutils.raises("access disabled", v.get_generator, dict()) v = language.Value.parseString("</outside")[0] @@ -554,7 +556,7 @@ class TestRequest: def test_render(self): s = cStringIO.StringIO() r = parse_request("GET:'/foo'") - assert language.serve(r, s, {}, "foo.com") + assert language.serve(r, s, {}, request_host = "foo.com") def test_multiline(self): l = """ diff --git a/test/test_pathoc.py b/test/test_pathoc.py index 90f798c9..52075231 100644 --- a/test/test_pathoc.py +++ b/test/test_pathoc.py @@ -51,7 +51,7 @@ class _TestDaemon: showssl=False, hexdump=False, timeout=None, - ignorecodes=None, + ignorecodes=(), ignoretimeout=None, showsummary=True ): |