diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-28 01:51:13 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-28 01:51:13 +0200 |
| commit | 1cc48345e13917aadc1e0fd93d6011139e78e3d9 (patch) | |
| tree | 9758b20f95587104807fc74e545e35ec9a9cdef3 /test/test_cmdline.py | |
| parent | a86491eeed13c7889356e5102312f52bd86c3c66 (diff) | |
| download | mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.tar.gz mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.tar.bz2 mitmproxy-1cc48345e13917aadc1e0fd93d6011139e78e3d9.zip | |
clean up config/cmdline, fix bugs, remove cruft
Diffstat (limited to 'test/test_cmdline.py')
| -rw-r--r-- | test/test_cmdline.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/test/test_cmdline.py b/test/test_cmdline.py index eafcbde4..ee2f7044 100644 --- a/test/test_cmdline.py +++ b/test/test_cmdline.py @@ -38,15 +38,15 @@ def test_parse_replace_hook(): def test_parse_server_spec(): tutils.raises("Invalid server specification", cmdline.parse_server_spec, "") assert cmdline.parse_server_spec( - "http://foo.com:88") == [False, False, "foo.com", 88] + "http://foo.com:88") == ("http", ("foo.com", 88)) assert cmdline.parse_server_spec( - "http://foo.com") == [False, False, "foo.com", 80] + "http://foo.com") == ("http", ("foo.com", 80)) assert cmdline.parse_server_spec( - "https://foo.com") == [True, True, "foo.com", 443] + "https://foo.com") == ("https", ("foo.com", 443)) assert cmdline.parse_server_spec_special( - "https2http://foo.com") == [True, False, "foo.com", 80] + "https2http://foo.com") == ("https2http", ("foo.com", 80)) assert cmdline.parse_server_spec_special( - "http2https://foo.com") == [False, True, "foo.com", 443] + "http2https://foo.com") == ("http2https", ("foo.com", 443)) tutils.raises( "Invalid server specification", cmdline.parse_server_spec, @@ -55,6 +55,10 @@ def test_parse_server_spec(): "Invalid server specification", cmdline.parse_server_spec, "http://") + tutils.raises( + "Invalid server specification", + cmdline.parse_server_spec, + "https2http://foo.com") def test_parse_setheaders(): |