Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

tests: specify 'text' mode for some output files in verify section

  • Loading branch information...
commit b0dfbf305a86bd8312090c6c1ff275a6f895a763 1 parent b3440f4
@yangtse yangtse authored
Showing with 92 additions and 92 deletions.
  1. +1 −1  tests/data/test1105
  2. +2 −2 tests/data/test1221
  3. +2 −2 tests/data/test1222
  4. +1 −1  tests/data/test1309
  5. +3 −3 tests/data/test1334
  6. +2 −2 tests/data/test1335
  7. +3 −3 tests/data/test1336
  8. +2 −2 tests/data/test1337
  9. +3 −3 tests/data/test1338
  10. +2 −2 tests/data/test1339
  11. +3 −3 tests/data/test1340
  12. +2 −2 tests/data/test1341
  13. +3 −3 tests/data/test1342
  14. +2 −2 tests/data/test1343
  15. +3 −3 tests/data/test1344
  16. +2 −2 tests/data/test1345
  17. +2 −2 tests/data/test1346
  18. +2 −2 tests/data/test1347
  19. +2 −2 tests/data/test1348
  20. +2 −2 tests/data/test1356
  21. +2 −2 tests/data/test1363
  22. +3 −3 tests/data/test1364
  23. +2 −2 tests/data/test1365
  24. +3 −3 tests/data/test1366
  25. +2 −2 tests/data/test1367
  26. +3 −3 tests/data/test1368
  27. +2 −2 tests/data/test1369
  28. +3 −3 tests/data/test1370
  29. +2 −2 tests/data/test1371
  30. +3 −3 tests/data/test1372
  31. +2 −2 tests/data/test1373
  32. +3 −3 tests/data/test1374
  33. +2 −2 tests/data/test1375
  34. +2 −2 tests/data/test1376
  35. +2 −2 tests/data/test1377
  36. +2 −2 tests/data/test1378
  37. +2 −2 tests/data/test1385
  38. +2 −2 tests/data/test1386
  39. +2 −2 tests/data/test1393
  40. +1 −1  tests/data/test24
  41. +1 −1  tests/data/test543
  42. +1 −1  tests/data/test571
  43. +1 −1  tests/data/test584
View
2  tests/data/test1105
@@ -53,7 +53,7 @@ Content-Type: application/x-www-form-urlencoded
userid=myname&password=mypassword
</protocol>
-<file name="log/cookie1105.txt">
+<file name="log/cookie1105.txt" mode="text">
# Netscape HTTP Cookie File
# http://curl.haxx.se/docs/http-cookies.html
# This file was generated by libcurl! Edit at your own risk.
View
4 tests/data/test1221
@@ -17,9 +17,9 @@ none
#
# Verify data after the test has been "shot"
<verify>
-<file1 name="log/stderr1221">
+<file1 name="log/stderr1221" mode="text">
</file1>
-<file2 name="log/stdout1221">
+<file2 name="log/stdout1221" mode="text">
Testing curl_10char_object_name...
result: 16AFKPQRST expected: 16AFKPQRST input: 123__678__ABC__FGH__KLM__PQRSTUV
View
4 tests/data/test1222
@@ -17,9 +17,9 @@ none
#
# Verify data after the test has been "shot"
<verify>
-<file1 name="log/stderr1222">
+<file1 name="log/stderr1222" mode="text">
</file1>
-<file2 name="log/stdout1222">
+<file2 name="log/stdout1222" mode="text">
Testing curl_8char_object_name...
result: 16AFKPQR expected: 16AFKPQR input: 123__678__ABC__FGH__KLM__PQRSTUV
View
2  tests/data/test1309
@@ -24,7 +24,7 @@ unit1309
</client>
<verify>
-<stdout>
+<stdout mode="text">
Result:
0.1013[3]
0.1003[2]
View
6 tests/data/test1334
@@ -55,11 +55,11 @@ Accept: */*
</protocol>
-<file1 name="log/1334">
+<file1 name="log/1334" mode="text">
12345
</file1>
-<file2 name="log/heads1334">
+<file2 name="log/heads1334" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -69,7 +69,7 @@ Content-Type: text/html
</file2>
-<file3 name="log/stdout1334">
+<file3 name="log/stdout1334" mode="text">
</file3>
</verify>
View
4 tests/data/test1335
@@ -55,11 +55,11 @@ Accept: */*
</protocol>
-<file1 name="log/1335">
+<file1 name="log/1335" mode="text">
12345
</file1>
-<file2 name="log/stdout1335">
+<file2 name="log/stdout1335" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
6 tests/data/test1336
@@ -59,11 +59,11 @@ Accept: */*
</protocol>
-<file1 name="log/1336">
+<file1 name="log/1336" mode="text">
12345
</file1>
-<file2 name="log/heads1336">
+<file2 name="log/heads1336" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -74,7 +74,7 @@ Content-Disposition: filename=name1336; charset=funny; option=strange
</file2>
-<file3 name="log/stdout1336">
+<file3 name="log/stdout1336" mode="text">
</file3>
</verify>
View
4 tests/data/test1337
@@ -59,11 +59,11 @@ Accept: */*
</protocol>
-<file1 name="log/1337">
+<file1 name="log/1337" mode="text">
12345
</file1>
-<file2 name="log/stdout1337">
+<file2 name="log/stdout1337" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
6 tests/data/test1338
@@ -56,11 +56,11 @@ Accept: */*
</protocol>
-<file1 name="log/1338">
+<file1 name="log/1338" mode="text">
12345
</file1>
-<file2 name="log/heads1338">
+<file2 name="log/heads1338" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -70,7 +70,7 @@ Content-Type: text/html
</file2>
-<file3 name="log/stdout1338">
+<file3 name="log/stdout1338" mode="text">
</file3>
</verify>
View
4 tests/data/test1339
@@ -56,11 +56,11 @@ Accept: */*
</protocol>
-<file1 name="log/1339">
+<file1 name="log/1339" mode="text">
12345
</file1>
-<file2 name="log/stdout1339">
+<file2 name="log/stdout1339" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
6 tests/data/test1340
@@ -57,11 +57,11 @@ Accept: */*
</protocol>
-<file1 name="log/name1340">
+<file1 name="log/name1340" mode="text">
12345
</file1>
-<file2 name="log/heads1340">
+<file2 name="log/heads1340" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -72,7 +72,7 @@ Content-Disposition: filename=name1340; charset=funny; option=strange
</file2>
-<file3 name="log/stdout1340">
+<file3 name="log/stdout1340" mode="text">
curl: Saved to filename '%PWD/log/name1340'
</file3>
View
4 tests/data/test1341
@@ -57,11 +57,11 @@ Accept: */*
</protocol>
-<file1 name="log/name1341">
+<file1 name="log/name1341" mode="text">
12345
</file1>
-<file2 name="log/stdout1341">
+<file2 name="log/stdout1341" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
6 tests/data/test1342
@@ -55,7 +55,7 @@ Accept: */*
</protocol>
-<file1 name="log/1342">
+<file1 name="log/1342" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -66,7 +66,7 @@ Content-Type: text/html
12345
</file1>
-<file2 name="log/heads1342">
+<file2 name="log/heads1342" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -76,7 +76,7 @@ Content-Type: text/html
</file2>
-<file3 name="log/stdout1342">
+<file3 name="log/stdout1342" mode="text">
</file3>
</verify>
View
4 tests/data/test1343
@@ -55,7 +55,7 @@ Accept: */*
</protocol>
-<file1 name="log/1343">
+<file1 name="log/1343" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -66,7 +66,7 @@ Content-Type: text/html
12345
</file1>
-<file2 name="log/stdout1343">
+<file2 name="log/stdout1343" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
6 tests/data/test1344
@@ -59,7 +59,7 @@ Accept: */*
</protocol>
-<file1 name="log/1344">
+<file1 name="log/1344" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -71,7 +71,7 @@ Content-Disposition: filename=name1344; charset=funny; option=strange
12345
</file1>
-<file2 name="log/heads1344">
+<file2 name="log/heads1344" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -82,7 +82,7 @@ Content-Disposition: filename=name1344; charset=funny; option=strange
</file2>
-<file3 name="log/stdout1344">
+<file3 name="log/stdout1344" mode="text">
</file3>
</verify>
View
4 tests/data/test1345
@@ -59,7 +59,7 @@ Accept: */*
</protocol>
-<file1 name="log/1345">
+<file1 name="log/1345" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -71,7 +71,7 @@ Content-Disposition: filename=name1345; charset=funny; option=strange
12345
</file1>
-<file2 name="log/stdout1345">
+<file2 name="log/stdout1345" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
4 tests/data/test1346
@@ -55,7 +55,7 @@ Accept: */*
</protocol>
-<file1 name="log/1346">
+<file1 name="log/1346" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -66,7 +66,7 @@ Content-Type: text/html
12345
</file1>
-<file2 name="log/stdout1346">
+<file2 name="log/stdout1346" mode="text">
</file2>
</verify>
View
4 tests/data/test1347
@@ -59,7 +59,7 @@ Accept: */*
</protocol>
-<file1 name="log/1347">
+<file1 name="log/1347" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -71,7 +71,7 @@ Content-Disposition: filename=name1347; charset=funny; option=strange
12345
</file1>
-<file2 name="log/stdout1347">
+<file2 name="log/stdout1347" mode="text">
</file2>
</verify>
View
4 tests/data/test1348
@@ -49,12 +49,12 @@ RETR file1348
QUIT
</protocol>
-<file1 name="log/file1348">
+<file1 name="log/file1348" mode="text">
fooo
mooo
</file1>
-<file2 name="log/stdout1348">
+<file2 name="log/stdout1348" mode="text">
</file2>
</verify>
View
4 tests/data/test1356
@@ -60,7 +60,7 @@ RETR file1356
QUIT
</protocol>
-<file1 name="log/file1356">
+<file1 name="log/file1356" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -72,7 +72,7 @@ Content-Disposition: filename=name1356; charset=funny; option=strange
MOOOO
</file1>
-<file2 name="log/stdout1356">
+<file2 name="log/stdout1356" mode="text">
</file2>
</verify>
View
4 tests/data/test1363
@@ -60,7 +60,7 @@ RETR file1363
QUIT
</protocol>
-<file1 name="log/file1363">
+<file1 name="log/file1363" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -72,7 +72,7 @@ Content-Disposition: filename=name1363; charset=funny; option=strange
MOOOO
</file1>
-<file2 name="log/stdout1363">
+<file2 name="log/stdout1363" mode="text">
</file2>
</verify>
View
6 tests/data/test1364
@@ -50,11 +50,11 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1364">
+<file1 name="log/outfile1364" mode="text">
12345
</file1>
-<file2 name="log/heads1364">
+<file2 name="log/heads1364" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -64,7 +64,7 @@ Content-Type: text/html
</file2>
-<file3 name="log/stdout1364">
+<file3 name="log/stdout1364" mode="text">
</file3>
</verify>
View
4 tests/data/test1365
@@ -50,11 +50,11 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1365">
+<file1 name="log/outfile1365" mode="text">
12345
</file1>
-<file2 name="log/stdout1365">
+<file2 name="log/stdout1365" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
6 tests/data/test1366
@@ -51,11 +51,11 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1366">
+<file1 name="log/outfile1366" mode="text">
12345
</file1>
-<file2 name="log/heads1366">
+<file2 name="log/heads1366" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -66,7 +66,7 @@ Content-Disposition: filename=name1366; charset=funny; option=strange
</file2>
-<file3 name="log/stdout1366">
+<file3 name="log/stdout1366" mode="text">
</file3>
</verify>
View
4 tests/data/test1367
@@ -51,11 +51,11 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1367">
+<file1 name="log/outfile1367" mode="text">
12345
</file1>
-<file2 name="log/stdout1367">
+<file2 name="log/stdout1367" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
6 tests/data/test1368
@@ -51,11 +51,11 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1368">
+<file1 name="log/outfile1368" mode="text">
12345
</file1>
-<file2 name="log/heads1368">
+<file2 name="log/heads1368" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -65,7 +65,7 @@ Content-Type: text/html
</file2>
-<file3 name="log/stdout1368">
+<file3 name="log/stdout1368" mode="text">
</file3>
</verify>
View
4 tests/data/test1369
@@ -51,11 +51,11 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1369">
+<file1 name="log/outfile1369" mode="text">
12345
</file1>
-<file2 name="log/stdout1369">
+<file2 name="log/stdout1369" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
6 tests/data/test1370
@@ -52,11 +52,11 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1370">
+<file1 name="log/outfile1370" mode="text">
12345
</file1>
-<file2 name="log/heads1370">
+<file2 name="log/heads1370" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -67,7 +67,7 @@ Content-Disposition: filename=name1370; charset=funny; option=strange
</file2>
-<file3 name="log/stdout1370">
+<file3 name="log/stdout1370" mode="text">
</file3>
</verify>
View
4 tests/data/test1371
@@ -52,11 +52,11 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1371">
+<file1 name="log/outfile1371" mode="text">
12345
</file1>
-<file2 name="log/stdout1371">
+<file2 name="log/stdout1371" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
6 tests/data/test1372
@@ -50,7 +50,7 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1372">
+<file1 name="log/outfile1372" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -61,7 +61,7 @@ Content-Type: text/html
12345
</file1>
-<file2 name="log/heads1372">
+<file2 name="log/heads1372" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -71,7 +71,7 @@ Content-Type: text/html
</file2>
-<file3 name="log/stdout1372">
+<file3 name="log/stdout1372" mode="text">
</file3>
</verify>
View
4 tests/data/test1373
@@ -50,7 +50,7 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1373">
+<file1 name="log/outfile1373" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -61,7 +61,7 @@ Content-Type: text/html
12345
</file1>
-<file2 name="log/stdout1373">
+<file2 name="log/stdout1373" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
6 tests/data/test1374
@@ -51,7 +51,7 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1374">
+<file1 name="log/outfile1374" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -63,7 +63,7 @@ Content-Disposition: filename=name1374; charset=funny; option=strange
12345
</file1>
-<file2 name="log/heads1374">
+<file2 name="log/heads1374" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -74,7 +74,7 @@ Content-Disposition: filename=name1374; charset=funny; option=strange
</file2>
-<file3 name="log/stdout1374">
+<file3 name="log/stdout1374" mode="text">
</file3>
</verify>
View
4 tests/data/test1375
@@ -51,7 +51,7 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1375">
+<file1 name="log/outfile1375" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -63,7 +63,7 @@ Content-Disposition: filename=name1375; charset=funny; option=strange
12345
</file1>
-<file2 name="log/stdout1375">
+<file2 name="log/stdout1375" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
View
4 tests/data/test1376
@@ -50,7 +50,7 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1376">
+<file1 name="log/outfile1376" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -61,7 +61,7 @@ Content-Type: text/html
12345
</file1>
-<file2 name="log/stdout1376">
+<file2 name="log/stdout1376" mode="text">
</file2>
</verify>
View
4 tests/data/test1377
@@ -51,7 +51,7 @@ Accept: */*
</protocol>
-<file1 name="log/outfile1377">
+<file1 name="log/outfile1377" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -63,7 +63,7 @@ Content-Disposition: filename=name1377; charset=funny; option=strange
12345
</file1>
-<file2 name="log/stdout1377">
+<file2 name="log/stdout1377" mode="text">
</file2>
</verify>
View
4 tests/data/test1378
@@ -44,12 +44,12 @@ RETR file1378
QUIT
</protocol>
-<file1 name="log/download1378">
+<file1 name="log/download1378" mode="text">
fooo
mooo
</file1>
-<file2 name="log/stdout1378">
+<file2 name="log/stdout1378" mode="text">
</file2>
</verify>
View
4 tests/data/test1385
@@ -44,12 +44,12 @@ RETR file1385
QUIT
</protocol>
-<file1 name="log/download1385">
+<file1 name="log/download1385" mode="text">
fooo
mooo
</file1>
-<file2 name="log/stdout1385">
+<file2 name="log/stdout1385" mode="text">
</file2>
</verify>
View
4 tests/data/test1386
@@ -52,7 +52,7 @@ RETR file1386
QUIT
</protocol>
-<file1 name="log/download1386">
+<file1 name="log/download1386" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -64,7 +64,7 @@ Content-Disposition: filename=name1386; charset=funny; option=strange
MOOOO
</file1>
-<file2 name="log/stdout1386">
+<file2 name="log/stdout1386" mode="text">
</file2>
</verify>
View
4 tests/data/test1393
@@ -52,7 +52,7 @@ RETR file1393
QUIT
</protocol>
-<file1 name="log/download1393">
+<file1 name="log/download1393" mode="text">
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
@@ -64,7 +64,7 @@ Content-Disposition: filename=name1393; charset=funny; option=strange
MOOOO
</file1>
-<file2 name="log/stdout1393">
+<file2 name="log/stdout1393" mode="text">
</file2>
</verify>
View
2  tests/data/test24
@@ -43,7 +43,7 @@ Accept: */*
<errorcode>
22
</errorcode>
-<file2 name="log/stderr24">
+<file2 name="log/stderr24" mode="text">
curl: (22) The requested URL returned error: 404 BAD BOY
</file2>
</verify>
View
2  tests/data/test543
@@ -28,7 +28,7 @@ curl_easy_escape
# There's no MTDM in the protocol here since this code doesn't ask for the
# time/date of the file
<verify>
-<stdout>
+<stdout mode="text">
%9C%26K%3DI%04%A1%01%E0%D8%7C%20%B7%EFS%29%FA%1DW%E1
</stdout>
</verify>
View
2  tests/data/test571
@@ -83,7 +83,7 @@ rtsp://%HOSTIP:%RTSPPORT/571 log/protofile.txt
</client>
<verify>
-<stdout>
+<stdout mode="text">
RTP: message size 10, channel 1
RTP: message size 500, channel 0
RTP: message size 196, channel 0
View
2  tests/data/test584
@@ -76,7 +76,7 @@ Host: %HOSTIP:%HTTPPORT
Accept: */*
</protocol>
-<stdout>
+<stdout mode="text">
HTTP/1.1 200 OK
Server: test-server/fake
Content-Length: 4
Please sign in to comment.
Something went wrong with that request. Please try again.