Commit 15feb821 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Fixed the 2000-series tests so that the downloaded data is actually checked

parent 59dccb34

tests/FILEFORMAT

+2 −2
Original line number Diff line number Diff line
@@ -213,9 +213,9 @@ If a CONNECT is used to the server (to emulate HTTPS etc over proxy), the port 
number given in the CONNECT request will be used to identify which test that

is being run, if the proxy host name is said to start with 'test'.



Set 'option=no-output' to prevent the test script to slap on the --output

Set option="no-output" to prevent the test script to slap on the --output

argument that directs the output to a file. The --output is also not added if

the client/stdout section is used.

the verify/stdout section is used.



Available substitute variables include:

%CLIENTIP   - IPv4 address of the client running curl

tests/data/test2000

+14 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ multiprotocol 
#

# Server-side

<reply>

<data>

<data nocheck="1">

data

    to

      see
@@ -56,5 +56,18 @@ SIZE 2000 
RETR 2000

QUIT

</protocol>

<stdout>

data

    to

      see

that FTP

works

  so does it?

foo

   bar

bar

   foo

moo

</stdout>

</verify>

</testcase>

tests/data/test2001

+38 −13
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ multiprotocol 
#

# Server-side

<reply>

<data1>

<data1 nocheck="1">

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake
@@ -27,7 +27,7 @@ Funny-head: yesyes 


-foo-

</data1>

<data2>

<data2 nocheck="1">

data

    to

      see
@@ -80,5 +80,30 @@ SIZE 20010002 
RETR 20010002

QUIT

</protocol>

<stdout>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT

ETag: "21025-dc7-39462498"

Accept-Ranges: bytes

Content-Length: 6

Connection: close

Content-Type: text/html

Funny-head: yesyes



-foo-

data

    to

      see

that FTP

works

  so does it?

foo

   bar

bar

   foo

moo

</stdout>

</verify>

</testcase>

tests/data/test2002

+43 −14
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ multiprotocol 
#

# Server-side

<reply>

<data1>

<data1 nocheck="1">

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake
@@ -29,7 +29,7 @@ Funny-head: yesyes 


-foo-

</data1>

<data2>

<data2 nocheck="1">

data

    to

      see
@@ -37,7 +37,7 @@ that FTP 
works

  so does it?

</data2>

<data3>

<data3 nocheck="1">

a chunk of

data

returned
@@ -92,5 +92,34 @@ filename: /20020003 
mode: octet

QUIT

</protocol>

<stdout>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT

ETag: "21025-dc7-39462498"

Accept-Ranges: bytes

Content-Length: 6

Connection: close

Content-Type: text/html

Funny-head: yesyes



-foo-

data

    to

      see

that FTP

works

  so does it?

foo

   bar

bar

   foo

moo

a chunk of

data

returned

 to TFTP client

</stdout>

</verify>

</testcase>

tests/data/test2003

+70 −14
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ multiprotocol 
#

# Server-side

<reply>

<data1>

<data1 nocheck="1">

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake
@@ -29,7 +29,7 @@ Funny-head: yesyes 


-foo-

</data1>

<data2>

<data2 nocheck="1">

data

    to

      see
@@ -37,7 +37,7 @@ that FTP 
works

  so does it?

</data2>

<data3>

<data3 nocheck="1">

a chunk of

data

returned
@@ -102,5 +102,61 @@ Accept: */* 


QUIT

</protocol>

<stdout>

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT

ETag: "21025-dc7-39462498"

Accept-Ranges: bytes

Content-Length: 6

Connection: close

Content-Type: text/html

Funny-head: yesyes



-foo-

data

    to

      see

that FTP

works

  so does it?

foo

   bar

bar

   foo

moo

a chunk of

data

returned

 to TFTP client

a chunk of

data

returned

 to TFTP client

foo

   bar

bar

   foo

moo

data

    to

      see

that FTP

works

  so does it?

HTTP/1.1 200 OK

Date: Thu, 09 Nov 2010 14:49:00 GMT

Server: test-server/fake

Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT

ETag: "21025-dc7-39462498"

Accept-Ranges: bytes

Content-Length: 6

Connection: close

Content-Type: text/html

Funny-head: yesyes



-foo-

</stdout>

</verify>

</testcase>