Added key words to all SSL-using tests so they can be skipped if necessary.

Removed a few unnecessary requires SSL statements.

14 files changed, 96 insertions, 11 deletions

diff --git a/tests/data/test146 b/tests/data/test146
index d9e52c8b9..e04f8f04d 100644
--- a/tests/data/test146
+++ b/tests/data/test146
@@ -3,9 +3,10 @@
 <keywords>
 FTP
 RETR
-persistant connection
+persistent connection
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>
@@ -19,7 +20,7 @@ this is file contents
 ftp
 </server>
  <name>
-persistant FTP with different paths
+persistent FTP with different paths
  </name>
  <command>
 ftp://%HOSTIP:%FTPPORT/first/dir/here/146 ftp://%HOSTIP:%FTPPORT/146
diff --git a/tests/data/test183 b/tests/data/test183
index cf20083f9..5fd01442a 100644
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+persistent connection
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
@@ -15,9 +23,6 @@ moo
 <server>
 http
 </server>
-<features>
-SSL
-</features>
  <name>
 HTTP GET two URLs over a single proxy with persistent connection
  </name>
diff --git a/tests/data/test184 b/tests/data/test184
index 3f1403bb3..e7b860e86 100644
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+</keywords>
+
+</info>
 # Server-side
 <reply>
 <data>
@@ -35,9 +43,6 @@ moo
 <server>
 http
 </server>
-<features>
-SSL
-</features>
  <name>
 HTTP replace Host: when following Location: to new host
  </name>
diff --git a/tests/data/test185 b/tests/data/test185
index 3ba31f888..fafd04e4b 100644
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+</keywords>
+
 # Server-side
 <reply>
 <data>
@@ -35,9 +42,6 @@ moo
 <server>
 http
 </server>
-<features>
-SSL
-</features>
  <name>
 HTTP replace Host: when following Location: on the same host
  </name>
diff --git a/tests/data/test300 b/tests/data/test300
index 310055606..7b4222d12 100644
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test301 b/tests/data/test301
index 9d0f7d807..d5974ce69 100644
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+HTTP Basic auth
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test302 b/tests/data/test302
index c989b7263..1223f1c33 100644
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -1,4 +1,14 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+HTTP CONNECT
+HTTP proxy
+FAILURE
+</keywords>
+</info>
+
 # Client-side
 <client>
 <features>
diff --git a/tests/data/test304 b/tests/data/test304
index 5fb352778..fedf18ff5 100644
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP POST
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test305 b/tests/data/test305
index cfd210da9..858a0040e 100644
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+FAILURE
+</keywords>
+</info>
+
 # Client-side
 <client>
 <features>
diff --git a/tests/data/test306 b/tests/data/test306
index e463c4b5b..95d4cef35 100644
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test307 b/tests/data/test307
index 8c954195a..03c2b3c2d 100644
--- a/tests/data/test307
+++ b/tests/data/test307
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test308 b/tests/data/test308
index cc7b32296..d20556a19 100644
--- a/tests/data/test308
+++ b/tests/data/test308
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+FAILURE
+</keywords>
+</info>
+
 #
 # Client-side
 <client>
diff --git a/tests/data/test509 b/tests/data/test509
index 3ed434eaa..d29a4ba78 100644
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
diff --git a/tests/data/test94 b/tests/data/test94
index 63aae01e4..6660302a1 100644
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 HTTPS
+HTTP GET
 HTTP CONNECT
 HTTP proxy
 FAILURE