From 1a7bba1975ba40df32bac2af26f4681da69c9d89 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 23 Feb 2012 23:13:42 +0100 Subject: [PATCH] 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. --- tests/data/test1400 | 14 ++++++---- tests/data/test1401 | 22 ++++++++------- tests/data/test1402 | 18 ++++++------ tests/data/test1403 | 14 ++++++---- tests/data/test1404 | 68 +++++++++++++++++++++++---------------------- tests/data/test1405 | 32 +++++++++++---------- tests/data/test1406 | 20 +++++++------ tests/data/test1407 | 12 ++++---- 8 files changed, 108 insertions(+), 92 deletions(-) diff --git a/tests/data/test1400 b/tests/data/test1400 index 762236ac07..f2aa631823 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -37,16 +37,18 @@ http://%HOSTIP:%HTTPPORT/we/want/1400 --libcurl log/test1400.c ^User-Agent:.* -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 +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: */* + 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/ /********* Sample code generated by the curl command line tool ********** diff --git a/tests/data/test1401 b/tests/data/test1401 index dd63fcc687..dce53d8cc0 100644 --- 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:.* -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 +User-Agent: stripped +Authorization: Basic ZmFrZTp1c2Vy +Host: %HOSTIP:%HTTPPORT +Accept: */* +Cookie: chocolate=chip +X-Files: Mulder +X-Men: cyclops, iceman + -# 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/ /********* Sample code generated by the curl command line tool ********** diff --git a/tests/data/test1402 b/tests/data/test1402 index d5f3df3652..896505146a 100644 --- 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:.* -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 +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 + foo=bar&baz=quux # 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/ /********* Sample code generated by the curl command line tool ********** diff --git a/tests/data/test1403 b/tests/data/test1403 index c9bc3ad7da..6646e47aae 100644 --- 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:.* -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 +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: */* + # 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/ /********* Sample code generated by the curl command line tool ********** diff --git a/tests/data/test1404 b/tests/data/test1404 index 90b8d6a5f1..6426e5701e 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -44,47 +44,49 @@ dummy data (^User-Agent:.*|-----+\w+) -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 +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 + dummy data - -------------------------------9ef8d6205763 -Content-Disposition: attachment; filename="test1404.txt" -Content-Type: magic/content - + +------------------------------9ef8d6205763 +Content-Disposition: attachment; filename="test1404.txt" +Content-Type: magic/content + dummy data - -------------------------------9ef8d6205763 -Content-Disposition: attachment; filename="test1404.txt" -Content-Type: text/plain - + +------------------------------9ef8d6205763 +Content-Disposition: attachment; filename="test1404.txt" +Content-Type: text/plain + dummy data - -------------------------------aaaaaaaaaaaa-- -------------------------------9ef8d6205763-- + +------------------------------aaaaaaaaaaaa-- +------------------------------9ef8d6205763-- # 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/ /********* Sample code generated by the curl command line tool ********** diff --git a/tests/data/test1405 b/tests/data/test1405 index 74925ee90b..08981f1a1b 100644 --- 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" -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 +PASS ftp@example.com +PWD +NOOP 1 +FAIL +EPSV +PASV +TYPE I +NOOP 2 +FAIL HARD +SIZE 1405 +RETR 1405 +NOOP 3 +QUIT /********* Sample code generated by the curl command line tool ********** @@ -126,8 +126,10 @@ int main(int argc, char *argv[]) # 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/ diff --git a/tests/data/test1406 b/tests/data/test1406 index d87b4e42a5..0bdbe43d3c 100644 --- 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" -EHLO user -MAIL FROM:<1406@from> SIZE=34 -RCPT TO:<1406@foo> -RCPT TO:<1406@foobar.example> -DATA -QUIT +EHLO user +MAIL FROM:<1406@from> SIZE=34 +RCPT TO:<1406@foo> +RCPT TO:<1406@foobar.example> +DATA +QUIT From: different To: another body - -. + +. /********* Sample code generated by the curl command line tool ********** @@ -112,8 +112,10 @@ int main(int argc, char *argv[]) # 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/ diff --git a/tests/data/test1407 b/tests/data/test1407 index 24d69b988c..ad1181b90d 100644 --- 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" -USER user -PASS secret -LIST 1407 -QUIT +USER user +PASS secret +LIST 1407 +QUIT /********* Sample code generated by the curl command line tool ********** @@ -90,8 +90,10 @@ int main(int argc, char *argv[]) # 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/ -- 2.47.3