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

to do nonlistening server tests, like other tests.

diff --git a/tests/data/test700 b/tests/data/test700
index 196fe4ed80ada4126cb172370cc9e7dc762c984c..e34d392b216a2865aa0644fdc030650d1cb31f8f 100644 (file)
--- 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 19fa933c03932fb468f9c935a235359835a8a181..bb6ff23ec7db6d79ac0d9149c4aa178b952032d6 100644 (file)
--- 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 65564f84089b8fb494299d946f5021363b9a78cd..36af71328f4f266f562b7cc61b4312765e347467 100644 (file)
--- 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 87c9a28aa60bbff4e048fe3e9fdc5537974f9499..4aa89b46a5d0b0a1f99c3a952a02b8b676f6196c 100644 (file)
--- 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 76792640d228e9454f145110783a2ce9f46679cc..15a1b670177748d987999d1dc76edbdc9f80d1c7 100644 (file)
--- 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 72e5b0b3b7c6b5e243894588f5df9c8423286ae7..3b904c6b1983ed99792a8c859ec7ab35857816da 100644 (file)
--- 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>