diff options
| -rw-r--r-- | tests/data/test700 | 2 | ||||
| -rw-r--r-- | tests/data/test701 | 2 | ||||
| -rw-r--r-- | tests/data/test702 | 6 | ||||
| -rw-r--r-- | tests/data/test703 | 10 | ||||
| -rw-r--r-- | tests/data/test704 | 14 | ||||
| -rw-r--r-- | tests/data/test705 | 15 |
6 files changed, 18 insertions, 31 deletions
diff --git a/tests/data/test700 b/tests/data/test700 index 196fe4ed8..e34d392b2 100644 --- a/tests/data/test700 +++ b/tests/data/test700 @@ -34,7 +34,7 @@ http socks4 </server> <name> -HTTP GET via SOCK4 proxy +HTTP GET via SOCKS4 proxy </name> <command> --socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/700 diff --git a/tests/data/test701 b/tests/data/test701 index 19fa933c0..bb6ff23ec 100644 --- a/tests/data/test701 +++ b/tests/data/test701 @@ -34,7 +34,7 @@ http socks5 </server> <name> -HTTP GET via SOCK5 proxy +HTTP GET via SOCKS5 proxy </name> <command> --socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/701 diff --git a/tests/data/test702 b/tests/data/test702 index 65564f840..36af71328 100644 --- a/tests/data/test702 +++ b/tests/data/test702 @@ -1,5 +1,5 @@ -#based off 19 <testcase> +#based off 19 <info> <keywords> HTTP @@ -23,10 +23,10 @@ socks4 http </features> <name> -attempt connect to non-listening socket via sock4 proxy +Attempt connect to non-listening HTTP server via SOCKS4 proxy </name> <command> ---socks4 %HOSTIP:%SOCKSPORT %HOSTIP:60000 +--socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:60000 </command> </client> diff --git a/tests/data/test703 b/tests/data/test703 index 87c9a28aa..4aa89b46a 100644 --- a/tests/data/test703 +++ b/tests/data/test703 @@ -1,9 +1,9 @@ -#based off 19 <testcase> +#based off 19 <info> <keywords> HTTP -SOCKS4 +SOCKS5 connect to non-listen FAILURE </keywords> @@ -17,16 +17,16 @@ FAILURE # Client-side <client> <server> -socks4 +socks5 </server> <features> http </features> <name> -attempt connect to non-listening socket via sock5 proxy +Attempt connect to non-listening HTTP server via SOCKS5 proxy </name> <command> ---socks5 %HOSTIP:%SOCKSPORT %HOSTIP:60000 +--socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:60000 </command> </client> diff --git a/tests/data/test704 b/tests/data/test704 index 76792640d..15a1b6701 100644 --- a/tests/data/test704 +++ b/tests/data/test704 @@ -1,9 +1,9 @@ -#based off 19 <testcase> +#based off 19 <info> <keywords> HTTP -SOCKS4 fail +SOCKS4 connect to non-listen FAILURE </keywords> @@ -19,17 +19,11 @@ FAILURE <server> http </server> -<killserver> -socks4 -</killserver> -<features> -http -</features> <name> -attempt connect to non-listening sock4 proxy +Attempt connect to non-listening SOCKS4 proxy </name> <command> ---socks4 %HOSTIP:%SOCKSPORT %HOSTIP:60000 +--socks4 %HOSTIP:60000 http://%HOSTIP:%HTTPPORT/704 </command> </client> diff --git a/tests/data/test705 b/tests/data/test705 index 72e5b0b3b..3b904c6b1 100644 --- a/tests/data/test705 +++ b/tests/data/test705 @@ -1,9 +1,9 @@ -#based off 19 <testcase> +#based off 19 <info> <keywords> HTTP -SOCKS5 fail +SOCKS5 connect to non-listen FAILURE </keywords> @@ -19,21 +19,14 @@ FAILURE <server> http </server> -<features> -http -</features> <name> -attempt connect to non-listening sock5 proxy +Attempt connect to non-listening SOCKS5 proxy </name> <command> ---socks5 %HOSTIP:%SOCKSPORT %HOSTIP:60000 +--socks5 %HOSTIP:60000 http://%HOSTIP:%HTTPPORT/705 </command> </client> -<killserver> -sock5 -</killserver> - # Verify data after the test has been "shot" <verify> <errorcode> |