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

Removed a few unnecessary requires SSL statements.
2008-02-09 02:08:34 +00:00
parent 59e3651af3
commit fc1443dcfc
15 changed files with 100 additions and 11 deletions
--- 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
--- 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>
--- 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>
--- 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>
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
--- 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>
--- 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>
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP POST
+</keywords>
+</info>
+
 # Server-side
 <reply>
 <data>
--- 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>
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
--- a/tests/data/test307
+++ b/tests/data/test307
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
--- a/tests/data/test308
+++ b/tests/data/test308
@@ -1,4 +1,12 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+FAILURE
+</keywords>
+</info>
+
 #
 # Client-side
 <client>
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -1,4 +1,11 @@
 <testcase>
+<info>
+<keywords>
+HTTPS
+HTTP GET
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 HTTPS
+HTTP GET
 HTTP CONNECT
 HTTP proxy
 FAILURE