From 821094ba728cb2778dd4ebad6ab1bb149504c73e Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Thu, 16 Jan 2014 23:41:31 +0100 Subject: Fixed some XML syntax issues in the test data Also, make the ftp server return a canned response that doesn't cause XML verification problems. Although the test file format isn't technically XML, it's still handy to be able to use XML tools to verify and manipulate them. --- tests/data/test1325 | 2 +- tests/data/test1331 | 2 +- tests/data/test1332 | 2 +- tests/data/test1349 | 2 +- tests/data/test1350 | 2 +- tests/data/test1351 | 2 +- tests/data/test1352 | 2 +- tests/data/test1353 | 2 +- tests/data/test1354 | 2 +- tests/data/test1357 | 2 +- tests/data/test1358 | 2 +- tests/data/test1359 | 2 +- tests/data/test1360 | 2 +- tests/data/test1361 | 2 +- tests/data/test1362 | 2 +- tests/data/test1379 | 2 +- tests/data/test1380 | 2 +- tests/data/test1381 | 2 +- tests/data/test1382 | 2 +- tests/data/test1383 | 2 +- tests/data/test1384 | 2 +- tests/data/test1387 | 2 +- tests/data/test1388 | 2 +- tests/data/test1389 | 2 +- tests/data/test1390 | 2 +- tests/data/test1391 | 2 +- tests/data/test1392 | 2 +- tests/data/test1415 | 1 + tests/data/test1900 | 1 + tests/data/test1901 | 1 + tests/data/test1902 | 1 + tests/data/test1903 | 1 + tests/data/test320 | 8 ++++---- tests/ftpserver.pl | 8 ++++---- 34 files changed, 40 insertions(+), 35 deletions(-) diff --git a/tests/data/test1325 b/tests/data/test1325 index 2b98d6adc..9f5ee58e8 100644 --- a/tests/data/test1325 +++ b/tests/data/test1325 @@ -1,5 +1,5 @@ -# http://greenbytes.de/tech/webdav/draft-reschke-http-status-308-latest.html +# http://greenbytes.de/tech/webdav/draft-reschke-http-status-308-latest.html HTTP diff --git a/tests/data/test1331 b/tests/data/test1331 index 406cb9e1a..689685692 100644 --- a/tests/data/test1331 +++ b/tests/data/test1331 @@ -1,8 +1,8 @@ + # Test case inspired by this question on stackoverflow: # # http://stackoverflow.com/questions/10017165/use-libcurl-with-bluecoat-cookie-proxy # - HTTP diff --git a/tests/data/test1332 b/tests/data/test1332 index 1850ece80..3447b2ddd 100644 --- a/tests/data/test1332 +++ b/tests/data/test1332 @@ -1,5 +1,5 @@ -# test case cloned from 1076 and then 302 was replaced with 303 +# test case cloned from 1076 and then 302 was replaced with 303 HTTP diff --git a/tests/data/test1349 b/tests/data/test1349 index 28576fe90..33906f8a2 100644 --- a/tests/data/test1349 +++ b/tests/data/test1349 @@ -60,7 +60,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1350 b/tests/data/test1350 index df12de59d..b7885972c 100644 --- a/tests/data/test1350 +++ b/tests/data/test1350 @@ -60,7 +60,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1351 b/tests/data/test1351 index d81265e01..3e9cc211b 100644 --- a/tests/data/test1351 +++ b/tests/data/test1351 @@ -61,7 +61,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1352 b/tests/data/test1352 index fa9d1ce7b..cf690af67 100644 --- a/tests/data/test1352 +++ b/tests/data/test1352 @@ -61,7 +61,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1353 b/tests/data/test1353 index b2954b14d..8bd751c26 100644 --- a/tests/data/test1353 +++ b/tests/data/test1353 @@ -60,7 +60,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1354 b/tests/data/test1354 index aa54f2d07..13c5a1bb5 100644 --- a/tests/data/test1354 +++ b/tests/data/test1354 @@ -58,7 +58,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1357 b/tests/data/test1357 index 952572032..3df0ad339 100644 --- a/tests/data/test1357 +++ b/tests/data/test1357 @@ -76,7 +76,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1358 b/tests/data/test1358 index 24cc724ea..b0e2795ed 100644 --- a/tests/data/test1358 +++ b/tests/data/test1358 @@ -76,7 +76,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1359 b/tests/data/test1359 index 96445bb4e..fc7851d92 100644 --- a/tests/data/test1359 +++ b/tests/data/test1359 @@ -77,7 +77,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1360 b/tests/data/test1360 index abfbe8c68..0000d60bb 100644 --- a/tests/data/test1360 +++ b/tests/data/test1360 @@ -77,7 +77,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1361 b/tests/data/test1361 index b97de16cd..884e0b216 100644 --- a/tests/data/test1361 +++ b/tests/data/test1361 @@ -76,7 +76,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1362 b/tests/data/test1362 index 0ea7461ea..98fffb6b0 100644 --- a/tests/data/test1362 +++ b/tests/data/test1362 @@ -76,7 +76,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1379 b/tests/data/test1379 index 0fd06d5c5..81314b6db 100644 --- a/tests/data/test1379 +++ b/tests/data/test1379 @@ -53,7 +53,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1380 b/tests/data/test1380 index ec7800d5d..e71527001 100644 --- a/tests/data/test1380 +++ b/tests/data/test1380 @@ -53,7 +53,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1381 b/tests/data/test1381 index 8f3bc37f0..a55c6b588 100644 --- a/tests/data/test1381 +++ b/tests/data/test1381 @@ -54,7 +54,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1382 b/tests/data/test1382 index fbf5195f7..a657e1fe2 100644 --- a/tests/data/test1382 +++ b/tests/data/test1382 @@ -54,7 +54,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1383 b/tests/data/test1383 index 0469e72e0..0694a2240 100644 --- a/tests/data/test1383 +++ b/tests/data/test1383 @@ -53,7 +53,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1384 b/tests/data/test1384 index 2deeb7c4c..c07c266b4 100644 --- a/tests/data/test1384 +++ b/tests/data/test1384 @@ -53,7 +53,7 @@ mooo 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1387 b/tests/data/test1387 index a2c5a4d6b..85ea948d3 100644 --- a/tests/data/test1387 +++ b/tests/data/test1387 @@ -68,7 +68,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1388 b/tests/data/test1388 index b4662e654..5f5cc0cff 100644 --- a/tests/data/test1388 +++ b/tests/data/test1388 @@ -68,7 +68,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1389 b/tests/data/test1389 index c2ac3ad9d..2357e314c 100644 --- a/tests/data/test1389 +++ b/tests/data/test1389 @@ -69,7 +69,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1390 b/tests/data/test1390 index 3cf86e775..53eac5b95 100644 --- a/tests/data/test1390 +++ b/tests/data/test1390 @@ -69,7 +69,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1391 b/tests/data/test1391 index 913f25afe..911bb5f51 100644 --- a/tests/data/test1391 +++ b/tests/data/test1391 @@ -68,7 +68,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1392 b/tests/data/test1392 index b05fc317c..4c8f0b190 100644 --- a/tests/data/test1392 +++ b/tests/data/test1392 @@ -68,7 +68,7 @@ MOOOO 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | -220- | (__| |_| | _ <| |___ +220- | (__| |_| | _ {| |___ 220 \___|\___/|_| \_\_____| 331 We are happy you popped in! 230 Welcome you silly person diff --git a/tests/data/test1415 b/tests/data/test1415 index 51eed3eed..e5871089d 100644 --- a/tests/data/test1415 +++ b/tests/data/test1415 @@ -44,6 +44,7 @@ TZ=GMT http://example.com/we/want/1415 -b none -c log/jar1415.txt -x %HOSTIP:%HTTPPORT + # Verify data after the test has been "shot" diff --git a/tests/data/test1900 b/tests/data/test1900 index 857c6096b..74f624dae 100644 --- a/tests/data/test1900 +++ b/tests/data/test1900 @@ -49,6 +49,7 @@ http://%HOSTIP:%HTTPPIPEPORT/ 0 1k.txt 0 1k.txt 0 1k.txt + # Verify data after the test has been "shot" diff --git a/tests/data/test1901 b/tests/data/test1901 index bacf9cb09..792de8e7f 100644 --- a/tests/data/test1901 +++ b/tests/data/test1901 @@ -50,6 +50,7 @@ blacklist_site 127.0.0.1:%HTTPPIPEPORT 0 1k.txt 0 1k.txt 0 1k.txt + # Verify data after the test has been "shot" diff --git a/tests/data/test1902 b/tests/data/test1902 index 22f262176..ee6b40391 100644 --- a/tests/data/test1902 +++ b/tests/data/test1902 @@ -49,6 +49,7 @@ http://%HOSTIP:%HTTPPIPEPORT/ 0 1k.txt 0 1k.txt 0 1k.txt + # Verify data after the test has been "shot" diff --git a/tests/data/test1903 b/tests/data/test1903 index 01efa67f8..e35ebcd19 100644 --- a/tests/data/test1903 +++ b/tests/data/test1903 @@ -49,6 +49,7 @@ http://%HOSTIP:%HTTPPIPEPORT/ 10 alphabet.txt 10 alphabet.txt 10 alphabet.txt + # Verify data after the test has been "shot" diff --git a/tests/data/test320 b/tests/data/test320 index 899bec597..cb0e23403 100644 --- a/tests/data/test320 +++ b/tests/data/test320 @@ -71,13 +71,13 @@ Content-type: text/html
If your browser supports session resuming, then you should see the same session ID, when you press the reload button.

Connected as user 'jsmith'.

-
+

Key Exchange:SRP
CompressionNULL
CipherAES-128-CBC
MACSHA1
CiphersuiteSRP_SHA_AES_128_CBC_SHA1
- +
 Host: %HOSTIP:%HTTPTLSSRPPORT
 Accept: */*
 
@@ -87,8 +87,8 @@ Accept: */*
 
 
 s/^
Session ID:.*//
-s/^
Your HTTP header was:.*//
-s/Protocol version:.*//
+s/^
Your HTTP header was:
.*/
/
+s/Protocol version:.*[0-9]//
 
 
 
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index c97524425..f2b12ebc3 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -559,7 +559,7 @@ sub protocolsetup {
             '220-        _   _ ____  _     '."\r\n",
             '220-    ___| | | |  _ \| |    '."\r\n",
             '220-   / __| | | | |_) | |    '."\r\n",
-            '220-  | (__| |_| |  _ <| |___ '."\r\n",
+            '220-  | (__| |_| |  _ {| |___ '."\r\n",
             '220    \___|\___/|_| \_\_____|'."\r\n")
         );
     }
@@ -585,7 +585,7 @@ sub protocolsetup {
             '        _   _ ____  _     '."\r\n",
             '    ___| | | |  _ \| |    '."\r\n",
             '   / __| | | | |_) | |    '."\r\n",
-            '  | (__| |_| |  _ <| |___ '."\r\n",
+            '  | (__| |_| |  _ {| |___ '."\r\n",
             '   \___|\___/|_| \_\_____|'."\r\n",
             '+OK cURL POP3 server ready to serve '."\r\n")
         );
@@ -619,7 +619,7 @@ sub protocolsetup {
             '        _   _ ____  _     '."\r\n",
             '    ___| | | |  _ \| |    '."\r\n",
             '   / __| | | | |_) | |    '."\r\n",
-            '  | (__| |_| |  _ <| |___ '."\r\n",
+            '  | (__| |_| |  _ {| |___ '."\r\n",
             '   \___|\___/|_| \_\_____|'."\r\n",
             '* OK cURL IMAP server ready to serve'."\r\n")
         );
@@ -643,7 +643,7 @@ sub protocolsetup {
             '220-        _   _ ____  _     '."\r\n",
             '220-    ___| | | |  _ \| |    '."\r\n",
             '220-   / __| | | | |_) | |    '."\r\n",
-            '220-  | (__| |_| |  _ <| |___ '."\r\n",
+            '220-  | (__| |_| |  _ {| |___ '."\r\n",
             '220    \___|\___/|_| \_\_____|'."\r\n")
         );
     }
-- 
cgit v1.2.3