From 15feb8217fffb50a2af13dc24c3432d23360ad8b Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Sat, 27 Oct 2007 01:04:36 +0000 Subject: Fixed the 2000-series tests so that the downloaded data is actually checked --- tests/data/test2000 | 15 +++++++++- tests/data/test2001 | 51 +++++++++++++++++++++++--------- tests/data/test2002 | 57 +++++++++++++++++++++++++++--------- tests/data/test2003 | 84 ++++++++++++++++++++++++++++++++++++++++++++--------- tests/data/test2004 | 18 +++++++++++- 5 files changed, 182 insertions(+), 43 deletions(-) (limited to 'tests/data') diff --git a/tests/data/test2000 b/tests/data/test2000 index ff679c50d..b5f4777d5 100644 --- a/tests/data/test2000 +++ b/tests/data/test2000 @@ -11,7 +11,7 @@ multiprotocol # # Server-side - + data to see @@ -56,5 +56,18 @@ SIZE 2000 RETR 2000 QUIT + +data + to + see +that FTP +works + so does it? +foo + bar +bar + foo +moo + diff --git a/tests/data/test2001 b/tests/data/test2001 index c468ac29f..475007e86 100644 --- a/tests/data/test2001 +++ b/tests/data/test2001 @@ -13,21 +13,21 @@ multiprotocol # # Server-side - -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 - + +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 @@ -80,5 +80,30 @@ SIZE 20010002 RETR 20010002 QUIT + +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 + diff --git a/tests/data/test2002 b/tests/data/test2002 index 26c395846..ed8ca1c4a 100644 --- a/tests/data/test2002 +++ b/tests/data/test2002 @@ -15,21 +15,21 @@ multiprotocol # # Server-side - -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 - + +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 @@ -37,7 +37,7 @@ that FTP works so does it? - + a chunk of data returned @@ -92,5 +92,34 @@ filename: /20020003 mode: octet QUIT + +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 + diff --git a/tests/data/test2003 b/tests/data/test2003 index e0466ad40..b6938166b 100644 --- a/tests/data/test2003 +++ b/tests/data/test2003 @@ -15,21 +15,21 @@ multiprotocol # # Server-side - -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 - + +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 @@ -37,7 +37,7 @@ that FTP works so does it? - + a chunk of data returned @@ -102,5 +102,61 @@ Accept: */* QUIT + +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- + diff --git a/tests/data/test2004 b/tests/data/test2004 index 27895ae22..eedabf381 100644 --- a/tests/data/test2004 +++ b/tests/data/test2004 @@ -13,7 +13,7 @@ multiprotocol # # Server-side - + Test data file for tftp test @@ -49,6 +49,22 @@ opcode: 1 filename: /2004 mode: octet + +Test data file +for tftp test +This is test data +for several protocols +This is test data +for several protocols +This is test data +for several protocols +This is test data +for several protocols +This is test data +for several protocols +Test data file +for tftp test + disable -- cgit v1.2.3