23 files changed, 152 insertions, 3 deletions
diff --git a/tests/data/test11 b/tests/data/test11
index eb72dfb65..f304f523d 100644
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test12 b/tests/data/test12
index 06a2eaeec..c6afd1c8a 100644
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP Range
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test13 b/tests/data/test13
index 7f7ddf8fe..7d247b25f 100644
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -1,3 +1,9 @@
+<info>
+<keywords>
+HTTP
+HTTP custom request
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test14 b/tests/data/test14
index 97afba36d..3e07e69e6 100644
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -1,3 +1,9 @@
+<info>
+<keywords>
+HTTP
+HTTP HEAD
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test15 b/tests/data/test15
index 325783b84..a3c557e92 100644
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+--write-out
+</keywords>
+</info>
 # Server-side
 <reply>
 <data nocheck=true>
diff --git a/tests/data/test16 b/tests/data/test16
index 13da70578..b7c3d5d35 100644
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP proxy Basic auth
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test17 b/tests/data/test17
index 52e706345..25de5d4bb 100644
--- a/tests/data/test17
+++ b/tests/data/test17
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP custom request
+config file
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test18 b/tests/data/test18
index df1b70361..283cbe2b1 100644
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+{} list
+</keywords>
+</info>
 # Server-side
 <reply>
 <data nocheck=1>
diff --git a/tests/data/test19 b/tests/data/test19
index 8aaa2023f..9a40db2ed 100644
--- a/tests/data/test19
+++ b/tests/data/test19
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+connect to non-listen
+FAILURE
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test20 b/tests/data/test20
index 5cfe1fb41..abc839892 100644
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -1,3 +1,9 @@
+<info>
+<keywords>
+non-existing host name
+FAILURE
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
@@ -7,7 +13,7 @@
 # Client-side
 <client>
 <server>
-http
+none
 </server>
  <name>
 attempt connect to non-existing host name
diff --git a/tests/data/test21 b/tests/data/test21
index 2fba375be..5f0338cac 100644
--- a/tests/data/test21
+++ b/tests/data/test21
@@ -1,3 +1,9 @@
+<info>
+<keywords>
+FAILURE
+multiple HTTP requests
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test22 b/tests/data/test22
index 2ffdbc59f..f2f16066b 100644
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP PUT
+long URL
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test23 b/tests/data/test23
index d09d9a71d..4155ea2cd 100644
--- a/tests/data/test23
+++ b/tests/data/test23
@@ -1,3 +1,9 @@
+<info>
+<keywords>
+unsupported protocol
+FAILURE
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test24 b/tests/data/test24
index 046c0a672..d6590578c 100644
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -1,3 +1,9 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
 # Server-side
 <reply>
 <data nocheck=1>
diff --git a/tests/data/test25 b/tests/data/test25
index 71e79ac7d..5e0b706cc 100644
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -1,3 +1,11 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+followlocation
+--max-redirs
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test26 b/tests/data/test26
index 0959342e5..41f80e42a 100644
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -1,3 +1,9 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test27 b/tests/data/test27
index 06e26a8d0..df8599771 100644
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+cookies
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test28 b/tests/data/test28
index 6506c10ae..a746f2348 100644
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -1,3 +1,9 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test29 b/tests/data/test29
index 9e47ac396..c258f6af6 100644
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -1,3 +1,11 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+timeout
+FAILURE
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test30 b/tests/data/test30
index 80bacc50e..01b86f6ca 100644
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -1,3 +1,10 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+FAILURE
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test31 b/tests/data/test31
index 2433ba34b..437317654 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -1,3 +1,11 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+cookies
+cookiejar
+</keywords>
+</info>
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test32 b/tests/data/test32
index 72664a1c0..b381aa8a5 100644
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -1,6 +1,13 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+-G
+</keywords>
+</info>
 #
 # Server-side
-<reply name="1">
+<reply>
 <data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
diff --git a/tests/data/test8 b/tests/data/test8
index 93795feda..31c985fe4 100644
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -2,7 +2,7 @@
 <keywords>
 HTTP
 HTTP GET
-HTTP cookies from header file
+cookies
 </keywords>
 </info>
 # Server-side