From 87ba80a6df1dfd7ceaaa52352c9f23afff0ed513 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Thu, 21 Feb 2019 22:06:16 +0100
Subject: tests: Fixed XML validation errors in some test files.

---
 tests/data/test1034 |   1 +
 tests/data/test1133 |   2 +-
 tests/data/test1149 |   2 +-
 tests/data/test1156 |   1 +
 tests/data/test1160 |   1 +
 tests/data/test1262 |   2 +-
 tests/data/test1263 |   2 +-
 tests/data/test1291 |   3 +--
 tests/data/test1425 | Bin 1726 -> 1726 bytes
 tests/data/test1426 | Bin 1663 -> 1663 bytes
 tests/data/test1449 |   2 +-
 tests/data/test1455 |   2 +-
 tests/data/test1456 |   4 ++--
 tests/data/test1457 |   1 -
 tests/data/test658  |   1 +
 15 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tests/data/test1034 b/tests/data/test1034
index beab0d3c0..b4ffc8a98 100644
--- a/tests/data/test1034
+++ b/tests/data/test1034
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <testcase>
 <info>
 <keywords>
diff --git a/tests/data/test1133 b/tests/data/test1133
index d71155eda..737f9d9e2 100644
--- a/tests/data/test1133
+++ b/tests/data/test1133
@@ -29,7 +29,7 @@ HTTP RFC1867-type formposting with filename/data contains ',', ';', '"'
 http://%HOSTIP:%HTTPPORT/we/want/1133 -F "file=@\"log/test1133,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"log/test1133,and;.txt"' -F 'file3=@"log/test1133,and;.txt";type=m/f,"log/test1133,and;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b'
 </command>
 # We create this file before the command is invoked!
-<file name=log/test1133,and;.txt>
+<file name="log/test1133,and;.txt">
 foo bar
 This is a bar foo
 bar
diff --git a/tests/data/test1149 b/tests/data/test1149
index ae081a8a9..f826391e9 100644
--- a/tests/data/test1149
+++ b/tests/data/test1149
@@ -1,5 +1,5 @@
-# based on test1010
 <testcase>
+# based on test1010
 <info>
 <keywords>
 FTP
diff --git a/tests/data/test1156 b/tests/data/test1156
index fb4836242..f78dc998f 100644
--- a/tests/data/test1156
+++ b/tests/data/test1156
@@ -67,4 +67,5 @@ http://%HOSTIP:%HTTPPORT/want/1156
 <errorcode>
 0
 </errorcode>
+</verify>
 </testcase>
diff --git a/tests/data/test1160 b/tests/data/test1160
index 3fe689e96..63dd0a7a0 100644
--- a/tests/data/test1160
+++ b/tests/data/test1160
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <testcase>
 <info>
 <keywords>
diff --git a/tests/data/test1262 b/tests/data/test1262
index 4b08a2cf2..ed526c099 100644
--- a/tests/data/test1262
+++ b/tests/data/test1262
@@ -1,5 +1,5 @@
-# similar to test 139 but with a reversed time condition
 <testcase>
+# similar to test 139 but with a reversed time condition
 <info>
 <keywords>
 FTP
diff --git a/tests/data/test1263 b/tests/data/test1263
index 7946916e2..7462db4d4 100644
--- a/tests/data/test1263
+++ b/tests/data/test1263
@@ -1,5 +1,5 @@
-# similar to test 1260
 <testcase>
+# similar to test 1260
 <info>
 <keywords>
 HTTP
diff --git a/tests/data/test1291 b/tests/data/test1291
index 12d65f3d8..3f1575184 100644
--- a/tests/data/test1291
+++ b/tests/data/test1291
@@ -1,7 +1,6 @@
+<testcase>
 # This test case is primarily meant to verify that parsing and adding the 100K
 # files is a swift operation.
-#
-<testcase>
 <info>
 <keywords>
 HTTP
diff --git a/tests/data/test1425 b/tests/data/test1425
index 0044c69d5..ce9ba97fb 100644
Binary files a/tests/data/test1425 and b/tests/data/test1425 differ
diff --git a/tests/data/test1426 b/tests/data/test1426
index dd6a8d117..851d8c3fb 100644
Binary files a/tests/data/test1426 and b/tests/data/test1426 differ
diff --git a/tests/data/test1449 b/tests/data/test1449
index d30c13c68..1911b0272 100644
--- a/tests/data/test1449
+++ b/tests/data/test1449
@@ -1,5 +1,5 @@
-# initially based on test110
 <testcase>
+# initially based on test110
 <info>
 <keywords>
 FTP
diff --git a/tests/data/test1455 b/tests/data/test1455
index 0b77dc4f5..7276ea4ec 100644
--- a/tests/data/test1455
+++ b/tests/data/test1455
@@ -9,7 +9,7 @@ HTTP GET
 #
 # Server-side
 <reply name="1455">
-<data nocheck=yes>
+<data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
diff --git a/tests/data/test1456 b/tests/data/test1456
index 07a6e7c03..007473618 100644
--- a/tests/data/test1456
+++ b/tests/data/test1456
@@ -9,7 +9,7 @@ IPv6
 #
 # Server-side
 <reply>
-<data nocheck=yes>
+<data nocheck="yes">
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -21,7 +21,7 @@ Connection: close
 Content-Type: text/html
 Funny-head: yesyes
 
--foo-
+These data aren't actually sent to the client
 </data>
 </reply>
 
diff --git a/tests/data/test1457 b/tests/data/test1457
index 43a5f35d3..575748f46 100644
--- a/tests/data/test1457
+++ b/tests/data/test1457
@@ -45,7 +45,6 @@ Content-Type: text/plain
 testdata
 line1line3
 </stdout>
-#note: as of now <stderr> doesn't actually exist in runtests.pl
 <stderr nonewline="yes">
 line2
 </stderr>
diff --git a/tests/data/test658 b/tests/data/test658
index c75293c6d..8c77eafec 100644
--- a/tests/data/test658
+++ b/tests/data/test658
@@ -45,6 +45,7 @@ GET /658 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
+</protocol>
 </verify>
 
 </testcase>
-- 
cgit v1.2.3