moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Cleaned up SOCKS tests. Use a magic port number instead of killserver 

to do nonlistening server tests, like other tests.
This commit is contained in:
Dan Fandrich 2007-06-07 20:14:00 +00:00
parent f0ffb35d55
commit 345ffd1163
6 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/data/test700
View File

@ -34,7 +34,7 @@ http
socks4 socks4
</server> </server>
<name> <name>
HTTP GET via SOCK4 proxy HTTP GET via SOCKS4 proxy
</name> </name>
<command> <command>
--socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/700 --socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/700

2
tests/data/test701
View File

@ -34,7 +34,7 @@ http
socks5 socks5
</server> </server>
<name> <name>
HTTP GET via SOCK5 proxy HTTP GET via SOCKS5 proxy
</name> </name>
<command> <command>
--socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/701 --socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:%HTTPPORT/701

6
tests/data/test702
View File

@ -1,5 +1,5 @@
#based off 19
<testcase> <testcase>
#based off 19
<info> <info>
<keywords> <keywords>
HTTP HTTP
@ -23,10 +23,10 @@ socks4
http http
</features> </features>
<name> <name>
attempt connect to non-listening socket via sock4 proxy Attempt connect to non-listening HTTP server via SOCKS4 proxy
</name> </name>
<command> <command>
--socks4 %HOSTIP:%SOCKSPORT %HOSTIP:60000 --socks4 %HOSTIP:%SOCKSPORT http://%HOSTIP:60000
</command> </command>
</client> </client>

10
tests/data/test703
View File

@ -1,9 +1,9 @@
#based off 19
<testcase> <testcase>
#based off 19
<info> <info>
<keywords> <keywords>
HTTP HTTP
SOCKS4 SOCKS5
connect to non-listen connect to non-listen
FAILURE FAILURE
</keywords> </keywords>
@ -17,16 +17,16 @@ FAILURE
# Client-side # Client-side
<client> <client>
<server> <server>
socks4 socks5
</server> </server>
<features> <features>
http http
</features> </features>
<name> <name>
attempt connect to non-listening socket via sock5 proxy Attempt connect to non-listening HTTP server via SOCKS5 proxy
</name> </name>
<command> <command>
--socks5 %HOSTIP:%SOCKSPORT %HOSTIP:60000 --socks5 %HOSTIP:%SOCKSPORT http://%HOSTIP:60000
</command> </command>
</client> </client>

14
tests/data/test704
View File

@ -1,9 +1,9 @@
#based off 19
<testcase> <testcase>
#based off 19
<info> <info>
<keywords> <keywords>
HTTP HTTP
SOCKS4 fail SOCKS4
connect to non-listen connect to non-listen
FAILURE FAILURE
</keywords> </keywords>
@ -19,17 +19,11 @@ FAILURE
<server> <server>
http http
</server> </server>
<killserver>
socks4
</killserver>
<features>
http
</features>
<name> <name>
attempt connect to non-listening sock4 proxy Attempt connect to non-listening SOCKS4 proxy
</name> </name>
<command> <command>
--socks4 %HOSTIP:%SOCKSPORT %HOSTIP:60000 --socks4 %HOSTIP:60000 http://%HOSTIP:%HTTPPORT/704
</command> </command>
</client> </client>

15
tests/data/test705
View File

@ -1,9 +1,9 @@
#based off 19
<testcase> <testcase>
#based off 19
<info> <info>
<keywords> <keywords>
HTTP HTTP
SOCKS5 fail SOCKS5
connect to non-listen connect to non-listen
FAILURE FAILURE
</keywords> </keywords>
@ -19,21 +19,14 @@ FAILURE
<server> <server>
http http
</server> </server>
<features>
http
</features>
<name> <name>
attempt connect to non-listening sock5 proxy Attempt connect to non-listening SOCKS5 proxy
</name> </name>
<command> <command>
--socks5 %HOSTIP:%SOCKSPORT %HOSTIP:60000 --socks5 %HOSTIP:60000 http://%HOSTIP:%HTTPPORT/705
</command> </command>
</client> </client>
<killserver>
sock5
</killserver>
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<errorcode> <errorcode>