diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | tests/data/DISABLED | 2 | ||||
| -rw-r--r-- | tests/data/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/data/test2002 | 96 | ||||
| -rw-r--r-- | tests/data/test2003 | 106 | ||||
| -rw-r--r-- | tests/server/tftpd.c | 18 |
6 files changed, 222 insertions, 7 deletions
@@ -7,9 +7,10 @@ Changelog Dan F (24 October 2007) -- Fixed the test FTP server to support the >10000 test number notation +- Fixed the test FTP and TFTP servers to support the >10000 test number + notation -- Added test cases 2000 and 2001 which test multiple protocols using the +- Added test cases 2000 through 2003 which test multiple protocols using the same easy handle - Fixed the filecheck: make target to work outside the source tree diff --git a/tests/data/DISABLED b/tests/data/DISABLED index 1e9f719f2..a655a70b9 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -4,4 +4,4 @@ # per line. # Lines starting with '#' letters are treated as comments. #1009 - +2003 diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 3cb6b2a4d..14a511bf3 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -45,7 +45,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test706 test707 test350 test351 test352 test353 test289 test540 test354 \ test231 test1000 test1001 test1002 test1003 test1004 test1005 test1006 \ test615 test1007 test541 test1010 test1011 test1012 test542 test543 \ - test536 test1008 test1009 test2000 test2001 + test536 test1008 test1009 test2000 test2001 test2002 test2003 filecheck: @mkdir test-place; \ diff --git a/tests/data/test2002 b/tests/data/test2002 new file mode 100644 index 000000000..26c395846 --- /dev/null +++ b/tests/data/test2002 @@ -0,0 +1,96 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +FTP +PASV +FILE +TFTP +TFTP RRQ +multiprotocol +</keywords> +</info> + +# +# Server-side +<reply> +<data1> +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- +</data1> +<data2> +data + to + see +that FTP +works + so does it? +</data2> +<data3> +a chunk of +data +returned + to TFTP client +</data3> +</reply> + +# +# Client-side +<client> +<server> +http +ftp +file +tftp +</server> + <name> +HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ + </name> + <command> +http://%HOSTIP:%HTTPPORT/20020001 ftp://%HOSTIP:%FTPPORT/20020002 file://localhost/%PWD/log/test2002.txt tftp://%HOSTIP:%TFTPPORT//20020003 +</command> +<file name="log/test2002.txt"> +foo + bar +bar + foo +moo +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /20020001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE 20020002
+RETR 20020002
+opcode: 1 +filename: /20020003 +mode: octet +QUIT
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test2003 b/tests/data/test2003 new file mode 100644 index 000000000..e0466ad40 --- /dev/null +++ b/tests/data/test2003 @@ -0,0 +1,106 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +FTP +PASV +FILE +TFTP +TFTP RRQ +multiprotocol +</keywords> +</info> + +# +# Server-side +<reply> +<data1> +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- +</data1> +<data2> +data + to + see +that FTP +works + so does it? +</data2> +<data3> +a chunk of +data +returned + to TFTP client +</data3> +</reply> + +# +# Client-side +<client> +<server> +http +ftp +file +tftp +</server> + <name> +HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ then again in reverse order + </name> + <command> +http://%HOSTIP:%HTTPPORT/20030001 ftp://%HOSTIP:%FTPPORT/20030002 file://localhost/%PWD/log/test2003.txt tftp://%HOSTIP:%TFTPPORT//20030003 tftp://%HOSTIP:%TFTPPORT//20030003 file://localhost/%PWD/log/test2003.txt ftp://%HOSTIP:%FTPPORT/20030002 http://%HOSTIP:%HTTPPORT/20030001 +</command> +<file name="log/test2003.txt"> +foo + bar +bar + foo +moo +</file> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /20030001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE 20030002
+RETR 20030002
+opcode: 1 +filename: /20030003 +mode: octet +opcode: 1 +filename: /20030003 +mode: octet +EPSV
+SIZE 20030002
+RETR 20030002
+GET /20030001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+QUIT
+</protocol> +</verify> +</testcase> diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 71cf88992..7dafd78a8 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -654,8 +654,9 @@ static int validate_access(struct testcase *test, const char *filename, int mode) { char *ptr; - long testno; + long testno, partno; int error; + char partbuf[80]="data"; logmsg("trying to get file: %s mode %x", filename, mode); @@ -686,12 +687,23 @@ static int validate_access(struct testcase *test, /* get the number */ testno = strtol(ptr, &ptr, 10); - logmsg("requested test number %d", testno); + if(testno > 10000) { + partno = testno % 10000; + testno /= 10000; + } + else + partno = 0; + + + logmsg("requested test number %ld part %ld", testno, partno); test->num = testno; file = test2file(testno); + if(0 != partno) + sprintf(partbuf, "data%ld", partno); + if(file) { FILE *stream=fopen(file, "rb"); if(!stream) { @@ -703,7 +715,7 @@ static int validate_access(struct testcase *test, } else { size_t count; - test->buffer = (char *)spitout(stream, "reply", "data", &count); + test->buffer = (char *)spitout(stream, "reply", partbuf, &count); fclose(stream); if(test->buffer) { test->rptr = test->buffer; /* set read pointer */ |