Commit 345ffd11 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

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

to do nonlistening server tests, like other tests.
parent f0ffb35d

tests/data/test700

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/data/test701

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/data/test702

+3 −3
Original line number Diff line number Diff line 
#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>

tests/data/test703

+5 −5
Original line number Diff line number Diff line 
#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>

tests/data/test704

+4 −10
Original line number Diff line number Diff line 
#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>