From ed2dbefa73621d26c7fe4f567e412a8fd8185848 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Thu, 17 Jul 2008 22:39:23 +0000
Subject: [PATCH] Fixed the XML syntax of a few test files.

---
 tests/data/test1026 |  2 +-
 tests/data/test1027 |  2 +-
 tests/data/test1033 |  2 +-
 tests/data/test12   | 29 +++++++++++++++--------------
 tests/data/test60   | 10 +++++-----
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/tests/data/test1026 b/tests/data/test1026
index 530fc8d0c..e47b12a0a 100644
--- a/tests/data/test1026
+++ b/tests/data/test1026
@@ -25,7 +25,7 @@ curl --manual
 # Search for these two sentinel lines in the manual output; if they are found,
 # then chances are good the entire manual is there.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(a\s*tool\s*to\s*transfer\s*data)|(mailing\s*lists\s*to\s*discuss\s*curl)/, <IN>); exit ($lines != 2);' log/stdout1026
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(a\s*tool\s*to\s*transfer\s*data)|(mailing\s*lists\s*to\s*discuss\s*curl)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout1026
 </postcheck>
 </client>
 
diff --git a/tests/data/test1027 b/tests/data/test1027
index 57ea87f2a..9c3d6e3ea 100644
--- a/tests/data/test1027
+++ b/tests/data/test1027
@@ -25,7 +25,7 @@ curl --help
 # Search for these two sentinel lines in the help output; if they are found,
 # then chances are good the entire help is there.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2);' log/stdout1027
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout1027
 </postcheck>
 </client>
 
diff --git a/tests/data/test1033 b/tests/data/test1033
index 62b03dfb2..9ad5d2526 100644
--- a/tests/data/test1033
+++ b/tests/data/test1033
@@ -1,7 +1,7 @@
+<testcase>
 #
 # This case with an unexpected 1xx response used to cause a "hang" before the fix
 # got 7.19.0
-<testcase>
 <info>
 <keywords>
 HTTP
diff --git a/tests/data/test12 b/tests/data/test12
index 35413b367..95b891aca 100644
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -6,23 +6,24 @@ HTTP GET
 Content-Range
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>
-HTTP/1.1 206 Partial Content
-Date: Mon, 13 Nov 2000 13:41:09 GMT
-Server: Apache/1.3.11 (Unix) PHP/3.0.14
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
-Content-Length: 101
-Content-Range: bytes 100-200/3527
-Connection: close
-Content-Type: text/html
-
-ink="#ffffff" vlink="#cccccc">
-<table width=100% cellspacing=0 cellpadding=0 border=0>
- <tr> 0123456
+HTTP/1.1 206 Partial Content
+Date: Mon, 13 Nov 2000 13:41:09 GMT
+Server: Apache/1.3.11 (Unix) PHP/3.0.14
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 101
+Content-Range: bytes 100-200/3527
+Connection: close
+Content-Type: text/html
+
+..partial data returned from the
+server as a result of setting an explicit byte range
+in the request
 </data>
 </reply>
 
diff --git a/tests/data/test60 b/tests/data/test60
index 6f403878c..dcc192b47 100644
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -8,10 +8,10 @@ HTTP PUT
 # Server-side
 <reply>
 <data>
-HTTP/1.0 200 OK swsclose
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-
+HTTP/1.0 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+
 blablabla
 
 </data>
@@ -26,7 +26,7 @@ http
 HTTP PUT from stdin with wrong content-length
 </name>
  <command>
-http://%HOSTIP:%HTTPPORT/bzz/60 -T - -H "Content-Length: 1" < log/60.txt
+http://%HOSTIP:%HTTPPORT/bzz/60 -T - -H "Content-Length: 1" <log/60.txt
 </command>
 <file name="log/60.txt">
 more than one byte