From 1cc48345e13917aadc1e0fd93d6011139e78e3d9 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 28 Aug 2015 01:51:13 +0200 Subject: clean up config/cmdline, fix bugs, remove cruft --- test/test_cmdline.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'test/test_cmdline.py') 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(): -- cgit v1.2.3 From 1dd09a5509219e7390abbb8c0b6818c7e792daa1 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 30 Aug 2015 02:27:38 +0200 Subject: always insert tls layer for inline script upgrades --- test/test_cmdline.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'test/test_cmdline.py') diff --git a/test/test_cmdline.py b/test/test_cmdline.py index ee2f7044..1443ee1c 100644 --- a/test/test_cmdline.py +++ b/test/test_cmdline.py @@ -43,10 +43,6 @@ def test_parse_server_spec(): "http://foo.com") == ("http", ("foo.com", 80)) assert cmdline.parse_server_spec( "https://foo.com") == ("https", ("foo.com", 443)) - assert cmdline.parse_server_spec_special( - "https2http://foo.com") == ("https2http", ("foo.com", 80)) - assert cmdline.parse_server_spec_special( - "http2https://foo.com") == ("http2https", ("foo.com", 443)) tutils.raises( "Invalid server specification", cmdline.parse_server_spec, -- cgit v1.2.3 From 421b241ff010ae979cff8df504b6744e4c291aeb Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 30 Aug 2015 13:40:23 +0200 Subject: remove http2http references --- test/test_cmdline.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'test/test_cmdline.py') diff --git a/test/test_cmdline.py b/test/test_cmdline.py index 1443ee1c..bb54d011 100644 --- a/test/test_cmdline.py +++ b/test/test_cmdline.py @@ -51,10 +51,6 @@ 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(): -- cgit v1.2.3