test: --libcurl fixes

The line endings broke when I saved the three recent patches (my fault,
not Colin's) to 'git am' them.

Adjusted the stripping of the test program for comparing to also exclude
the SSH key file name as that will differ and use a local path name.

diff --git a/tests/data/test1400 b/tests/data/test1400
index 762236ac073253ded95d9e0103a6b3b5af78c5d2..f2aa63182360e18442ed52e8546fdd9151d5d440 100644 (file)
--- a/tests/data/test1400
+++ b/tests/data/test1400
@@ -37,16 +37,18 @@ http://%HOSTIP:%HTTPPORT/we/want/1400 --libcurl log/test1400.c
 ^User-Agent:.*
 </strip>
 <protocol>
-GET /we/want/1400 HTTP/1.1
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-
+GET /we/want/1400 HTTP/1.1\r
+User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
 </protocol>
 <stripfile>
 s/(USERAGENT, \")[^\"]+/${1}stripped/
-# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it
+# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just
+# ignore them
 $_ = '' if /CURLOPT_SSL_VERIFYPEER/
+$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 </stripfile>
 <file name="log/test1400.c">
 /********* Sample code generated by the curl command line tool **********

diff --git a/tests/data/test1401 b/tests/data/test1401
index dd63fcc68779eb7f06b74cca2b6e16bf286507e9..dce53d8cc01b932ed898d812f19d2de7994368ed 100644 (file)
--- a/tests/data/test1401
+++ b/tests/data/test1401
@@ -39,19 +39,21 @@ http://%HOSTIP:%HTTPPORT/we/want/1401 --libcurl log/test1401.c --basic -u fake:u
 ^User-Agent:.*
 </strip>
 <protocol>
-GET /we/want/1401 HTTP/1.1
-User-Agent: stripped
-Authorization: Basic ZmFrZTp1c2Vy
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-Cookie: chocolate=chip
-X-Files: Mulder
-X-Men: cyclops, iceman
-
+GET /we/want/1401 HTTP/1.1\r
+User-Agent: stripped\r
+Authorization: Basic ZmFrZTp1c2Vy\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+Cookie: chocolate=chip\r
+X-Files: Mulder\r
+X-Men: cyclops, iceman\r
+\r
 </protocol>
 <stripfile>
-# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it
+# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just
+# ignore them
 $_ = '' if /CURLOPT_SSL_VERIFYPEER/
+$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 </stripfile>
 <file name="log/test1401.c">
 /********* Sample code generated by the curl command line tool **********

diff --git a/tests/data/test1402 b/tests/data/test1402
index d5f3df3652668f869fe35a44566c94a425f6c813..896505146a042e9db3dd70187b425d34ea4ebc9e 100644 (file)
--- a/tests/data/test1402
+++ b/tests/data/test1402
@@ -39,20 +39,22 @@ http://%HOSTIP:%HTTPPORT/we/want/1402 --libcurl log/test1402.c -d "foo=bar" -d "
 ^User-Agent:.*
 </strip>
 <protocol nonewline="yes">
-POST /we/want/1402 HTTP/1.1
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-Content-Length: 16
-Content-Type: application/x-www-form-urlencoded
-
+POST /we/want/1402 HTTP/1.1\r
+User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+Content-Length: 16\r
+Content-Type: application/x-www-form-urlencoded\r
+\r
 foo=bar&baz=quux
 </protocol>
 <stripfile>
 # curl's default user-agent varies with version, libraries etc.
 s/(USERAGENT, \")[^\"]+/${1}stripped/
-# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it
+# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just
+# ignore them
 $_ = '' if /CURLOPT_SSL_VERIFYPEER/
+$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 </stripfile>
 <file name="log/test1402.c">
 /********* Sample code generated by the curl command line tool **********

diff --git a/tests/data/test1403 b/tests/data/test1403
index c9bc3ad7da814daeebbc8d692f4478e494c45410..6646e47aae8f4d4667ff68a3e1011cdbdf88e2de 100644 (file)
--- a/tests/data/test1403
+++ b/tests/data/test1403
@@ -39,17 +39,19 @@ http://%HOSTIP:%HTTPPORT/we/want/1403 --libcurl log/test1403.c -G -d "foo=bar" -
 ^User-Agent:.*
 </strip>
 <protocol>
-GET /we/want/1403?foo=bar&baz=quux HTTP/1.1
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-
+GET /we/want/1403?foo=bar&baz=quux HTTP/1.1\r
+User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+\r
 </protocol>
 <stripfile>
 # curl's default user-agent varies with version, libraries etc.
 s/(USERAGENT, \")[^\"]+/${1}stripped/
-# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it
+# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just
+# ignore them
 $_ = '' if /CURLOPT_SSL_VERIFYPEER/
+$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 </stripfile>
 <file name="log/test1403.c">
 /********* Sample code generated by the curl command line tool **********

diff --git a/tests/data/test1404 b/tests/data/test1404
index 90b8d6a5f1e1c0cbd4fb979d96225811839438dc..6426e5701e17abd3bd751927d24acf1abf693b2c 100644 (file)
--- a/tests/data/test1404
+++ b/tests/data/test1404
@@ -44,47 +44,49 @@ dummy data
 (^User-Agent:.*|-----+\w+)
 </strip>
 <protocol>
-POST /we/want/1404 HTTP/1.1
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4
-Host: %HOSTIP:%HTTPPORT
-Accept: */*
-Content-Length: 795
-Expect: 100-continue
-Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
-
-------------------------------9ef8d6205763
-Content-Disposition: form-data; name="name"
-
-value
-------------------------------9ef8d6205763
-Content-Disposition: form-data; name="file"
-Content-Type: multipart/mixed; boundary=----------------------------aaaaaaaaaaaa
-
-Content-Disposition: attachment; filename="test1404.txt"
-Content-Type: text/plain
-
+POST /we/want/1404 HTTP/1.1\r
+User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
+Host: %HOSTIP:%HTTPPORT\r
+Accept: */*\r
+Content-Length: 795\r
+Expect: 100-continue\r
+Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763\r
+\r
+------------------------------9ef8d6205763\r
+Content-Disposition: form-data; name="name"\r
+\r
+value\r
+------------------------------9ef8d6205763\r
+Content-Disposition: form-data; name="file"\r
+Content-Type: multipart/mixed; boundary=----------------------------aaaaaaaaaaaa\r
+\r
+Content-Disposition: attachment; filename="test1404.txt"\r
+Content-Type: text/plain\r
+\r
 dummy data
-
-------------------------------9ef8d6205763
-Content-Disposition: attachment; filename="test1404.txt"
-Content-Type: magic/content
-
+\r
+------------------------------9ef8d6205763\r
+Content-Disposition: attachment; filename="test1404.txt"\r
+Content-Type: magic/content\r
+\r
 dummy data
-
-------------------------------9ef8d6205763
-Content-Disposition: attachment; filename="test1404.txt"
-Content-Type: text/plain
-
+\r
+------------------------------9ef8d6205763\r
+Content-Disposition: attachment; filename="test1404.txt"\r
+Content-Type: text/plain\r
+\r
 dummy data
-
-------------------------------aaaaaaaaaaaa--
-------------------------------9ef8d6205763--
+\r
+------------------------------aaaaaaaaaaaa--\r
+------------------------------9ef8d6205763--\r
 </protocol>
 <stripfile>
 # curl's default user-agent varies with version, libraries etc.
 s/(USERAGENT, \")[^\"]+/${1}stripped/
-# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it
+# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just
+# ignore them
 $_ = '' if /CURLOPT_SSL_VERIFYPEER/
+$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 </stripfile>
 <file name="log/test1404.c">
 /********* Sample code generated by the curl command line tool **********

diff --git a/tests/data/test1405 b/tests/data/test1405
index 74925ee90b42ad7313edc7168ef5ab7cc6d3d079..08981f1a1b1ff082211c41eb5d2afa17fb38c88d 100644 (file)
--- a/tests/data/test1405
+++ b/tests/data/test1405
@@ -41,20 +41,20 @@ ftp://%HOSTIP:%FTPPORT/1405 -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-USER anonymous
-PASS ftp@example.com
-PWD
-NOOP 1
-FAIL
-EPSV
-PASV
-TYPE I
-NOOP 2
-FAIL HARD
-SIZE 1405
-RETR 1405
-NOOP 3
-QUIT
+USER anonymous\r
+PASS ftp@example.com\r
+PWD\r
+NOOP 1\r
+FAIL\r
+EPSV\r
+PASV\r
+TYPE I\r
+NOOP 2\r
+FAIL HARD\r
+SIZE 1405\r
+RETR 1405\r
+NOOP 3\r
+QUIT\r
 </protocol>
 <file name="log/test1405.c">
 /********* Sample code generated by the curl command line tool **********
@@ -126,8 +126,10 @@ int main(int argc, char *argv[])
 <stripfile>
 # curl's default user-agent varies with version, libraries etc.
 s/(USERAGENT, \")[^\"]+/${1}stripped/
-# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it
+# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just
+# ignore them
 $_ = '' if /CURLOPT_SSL_VERIFYPEER/
+$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 </stripfile>
 </verify>
 </testcase>

diff --git a/tests/data/test1406 b/tests/data/test1406
index d87b4e42a5d0cce2854bfcfb1ce373175b40bd7d..0bdbe43d3c2d4c834e6ed7d75c130655c06a7c7e 100644 (file)
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -37,20 +37,20 @@ smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 1406@foo --mail-rcpt 1406@foobar.examp
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO user
-MAIL FROM:<1406@from> SIZE=34
-RCPT TO:<1406@foo>
-RCPT TO:<1406@foobar.example>
-DATA
-QUIT
+EHLO user\r
+MAIL FROM:<1406@from> SIZE=34\r
+RCPT TO:<1406@foo>\r
+RCPT TO:<1406@foobar.example>\r
+DATA\r
+QUIT\r
 </protocol>
 <upload>
 From: different
 To: another
 
 body
-
-.
+\r
+.\r
 </upload>
 <file name="log/test1406.c">
 /********* Sample code generated by the curl command line tool **********
@@ -112,8 +112,10 @@ int main(int argc, char *argv[])
 <stripfile>
 # curl's default user-agent varies with version, libraries etc.
 s/(USERAGENT, \")[^\"]+/${1}stripped/
-# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it
+# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just
+# ignore them
 $_ = '' if /CURLOPT_SSL_VERIFYPEER/
+$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 </stripfile>
 </verify>
 </testcase>

diff --git a/tests/data/test1407 b/tests/data/test1407
index 24d69b988cfaac94c710f6289a3a69cc30de296f..ad1181b90d097c74732fcf52032377ed152586b4 100644 (file)
--- a/tests/data/test1407
+++ b/tests/data/test1407
@@ -34,10 +34,10 @@ pop3://%HOSTIP:%POP3PORT/1407 -l -u user:secret --libcurl log/test1407.c
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-USER user
-PASS secret
-LIST 1407
-QUIT
+USER user\r
+PASS secret\r
+LIST 1407\r
+QUIT\r
 </protocol>
 <file name="log/test1407.c">
 /********* Sample code generated by the curl command line tool **********
@@ -90,8 +90,10 @@ int main(int argc, char *argv[])
 <stripfile>
 # curl's default user-agent varies with version, libraries etc.
 s/(USERAGENT, \")[^\"]+/${1}stripped/
-# CURLOPT_SSL_VERIFYPEER varies with configuration - just ignore it
+# CURLOPT_SSL_VERIFYPEER and SSH_KNOWNHOSTS vary with configurations - just
+# ignore them
 $_ = '' if /CURLOPT_SSL_VERIFYPEER/
+$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 </stripfile>
 </verify>
 </testcase>