From 3f4b1b4ee5eb5e6c423e496c5b9b9f1457f40d99 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 1 Sep 2021 15:51:06 +0200 Subject: tests: adjust the tftpd output to work with hyper mode By making them look less like http headers, the hyper mode "tweak" doesn't interfere. Enable test 2002 and 2003 in hyper builds (and 1280 which is unrelated but should be enabled). Closes #7658 --- tests/data/DISABLED | 3 --- tests/data/test1007 | 12 ++++++------ tests/data/test1009 | 12 ++++++------ tests/data/test1049 | 12 ++++++------ tests/data/test1093 | 12 ++++++------ tests/data/test1094 | 12 ++++++------ tests/data/test1099 | 24 ++++++++++++------------ tests/data/test1238 | 12 ++++++------ tests/data/test1242 | 6 +++--- tests/data/test1243 | 6 +++--- tests/data/test2002 | 12 ++++++------ tests/data/test2003 | 24 ++++++++++++------------ tests/data/test2004 | 24 ++++++++++++------------ tests/data/test271 | 12 ++++++------ tests/data/test283 | 12 ++++++------ tests/data/test284 | 12 ++++++------ tests/data/test285 | 12 ++++++------ tests/data/test286 | 12 ++++++------ tests/data/test332 | 12 ++++++------ tests/server/tftpd.c | 6 +++--- 20 files changed, 123 insertions(+), 126 deletions(-) diff --git a/tests/data/DISABLED b/tests/data/DISABLED index c34594d19..9744ac062 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -79,7 +79,6 @@ 1176 1266 1267 -1280 1287 1288 1294 @@ -101,6 +100,4 @@ 1701 1702 1800 -2002 -2003 %endif diff --git a/tests/data/test1007 b/tests/data/test1007 index e3c12b8d1..c50e97d51 100644 --- a/tests/data/test1007 +++ b/tests/data/test1007 @@ -31,12 +31,12 @@ This data will not be sent 69 -opcode: 2 -mode: octet -tsize: 27 -blksize: 512 -timeout: 6 -filename: /invalid-file +opcode = 2 +mode = octet +tsize = 27 +blksize = 512 +timeout = 6 +filename = /invalid-file diff --git a/tests/data/test1009 b/tests/data/test1009 index 223fcdbd0..9e1fa55f5 100644 --- a/tests/data/test1009 +++ b/tests/data/test1009 @@ -36,12 +36,12 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --local-port 44444-45444 # Verify pseudo protocol after the test has been "shot" -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER diff --git a/tests/data/test1049 b/tests/data/test1049 index 713b4bb19..54d23903a 100644 --- a/tests/data/test1049 +++ b/tests/data/test1049 @@ -36,12 +36,12 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --interface %CLIENTIP # Verify pseudo protocol after the test has been "shot" -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER diff --git a/tests/data/test1093 b/tests/data/test1093 index 5e1484d16..4fbc7b81b 100644 --- a/tests/data/test1093 +++ b/tests/data/test1093 @@ -36,12 +36,12 @@ TFTP retrieve with mode=i # Verify pseudo protocol after the test has been "shot" -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER diff --git a/tests/data/test1094 b/tests/data/test1094 index 3ed53f281..dd1452bb5 100644 --- a/tests/data/test1094 +++ b/tests/data/test1094 @@ -42,12 +42,12 @@ TFTP retrieve with mode=netascii # Verify pseudo protocol after the test has been "shot" -opcode: 1 -mode: netascii -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER +opcode = 1 +mode = netascii +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER diff --git a/tests/data/test1099 b/tests/data/test1099 index f2fa2f28b..77099916f 100644 --- a/tests/data/test1099 +++ b/tests/data/test1099 @@ -31,18 +31,18 @@ tftp://%HOSTIP:%TFTPPORT/an/invalid-file tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER # Verify pseudo protocol after the test has been "shot" -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: an/invalid-file -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = an/invalid-file +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER data for %TESTNUMBER diff --git a/tests/data/test1238 b/tests/data/test1238 index 606dd1fe4..cfb541c9c 100644 --- a/tests/data/test1238 +++ b/tests/data/test1238 @@ -45,12 +45,12 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER -Y1000 -y2 # Verify pseudo protocol after the test has been "shot" -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER # 28 = CURLE_OPERATION_TIMEDOUT diff --git a/tests/data/test1242 b/tests/data/test1242 index 9f573a756..61938a041 100644 --- a/tests/data/test1242 +++ b/tests/data/test1242 @@ -35,9 +35,9 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-no-options # Verify pseudo protocol after the test has been "shot" -opcode: 1 -mode: octet -filename: /%TESTNUMBER +opcode = 1 +mode = octet +filename = /%TESTNUMBER diff --git a/tests/data/test1243 b/tests/data/test1243 index f8b246fe7..ba08a837f 100644 --- a/tests/data/test1243 +++ b/tests/data/test1243 @@ -36,9 +36,9 @@ sent to server -opcode: 2 -mode: octet -filename: /test%TESTNUMBER.txt +opcode = 2 +mode = octet +filename = /test%TESTNUMBER.txt diff --git a/tests/data/test2002 b/tests/data/test2002 index 68144f8cf..2cd28016b 100644 --- a/tests/data/test2002 +++ b/tests/data/test2002 @@ -85,12 +85,12 @@ EPSV TYPE I SIZE %TESTNUMBER0002 RETR %TESTNUMBER0002 -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER0003 +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER0003 QUIT diff --git a/tests/data/test2003 b/tests/data/test2003 index 76d85211a..a1d5a9fc2 100644 --- a/tests/data/test2003 +++ b/tests/data/test2003 @@ -85,18 +85,18 @@ EPSV TYPE I SIZE %TESTNUMBER0002 RETR %TESTNUMBER0002 -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER0003 -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER0003 +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER0003 +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER0003 EPSV SIZE %TESTNUMBER0002 RETR %TESTNUMBER0002 diff --git a/tests/data/test2004 b/tests/data/test2004 index 6ef9c6cfd..17a73167a 100644 --- a/tests/data/test2004 +++ b/tests/data/test2004 @@ -42,18 +42,18 @@ for several protocols # Verify data after the test has been "shot" -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER Test data file diff --git a/tests/data/test271 b/tests/data/test271 index a9a44360f..f6d5ad7b5 100644 --- a/tests/data/test271 +++ b/tests/data/test271 @@ -35,12 +35,12 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER # Verify pseudo protocol after the test has been "shot" -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER diff --git a/tests/data/test283 b/tests/data/test283 index 201df9f72..2c1ebd249 100644 --- a/tests/data/test283 +++ b/tests/data/test283 @@ -28,12 +28,12 @@ tftp://%HOSTIP:%TFTPPORT//invalid-file --tftp-blksize 1024 69 -opcode: 1 -mode: octet -tsize: 0 -blksize: 1024 -timeout: 6 -filename: /invalid-file +opcode = 1 +mode = octet +tsize = 0 +blksize = 1024 +timeout = 6 +filename = /invalid-file diff --git a/tests/data/test284 b/tests/data/test284 index bee74f4c7..2f4ea4317 100644 --- a/tests/data/test284 +++ b/tests/data/test284 @@ -59,12 +59,12 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER # Verify pseudo protocol after the test has been "shot" -opcode: 1 -mode: octet -tsize: 0 -blksize: 512 -timeout: 6 -filename: /%TESTNUMBER +opcode = 1 +mode = octet +tsize = 0 +blksize = 512 +timeout = 6 +filename = /%TESTNUMBER diff --git a/tests/data/test285 b/tests/data/test285 index 23fe66ef1..ab055e416 100644 --- a/tests/data/test285 +++ b/tests/data/test285 @@ -36,12 +36,12 @@ sent to server -opcode: 2 -mode: octet -tsize: 32 -blksize: 512 -timeout: 6 -filename: /test%TESTNUMBER.txt +opcode = 2 +mode = octet +tsize = 32 +blksize = 512 +timeout = 6 +filename = /test%TESTNUMBER.txt diff --git a/tests/data/test286 b/tests/data/test286 index 3fa774bd3..febd5e3fb 100644 --- a/tests/data/test286 +++ b/tests/data/test286 @@ -84,12 +84,12 @@ condition in the TFTP transmit code. 123456789ABCDEF -opcode: 2 -mode: octet -tsize: 512 -blksize: 512 -timeout: 6 -filename: /test%TESTNUMBER.txt +opcode = 2 +mode = octet +tsize = 512 +blksize = 512 +timeout = 6 +filename = /test%TESTNUMBER.txt diff --git a/tests/data/test332 b/tests/data/test332 index 4f4c28b5d..d2bd8bb6e 100644 --- a/tests/data/test332 +++ b/tests/data/test332 @@ -34,12 +34,12 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-blksize 400 # Verify pseudo protocol after the test has been "shot" -opcode: 1 -mode: octet -tsize: 0 -blksize: 400 -timeout: 6 -filename: /%TESTNUMBER +opcode = 1 +mode = octet +tsize = 0 +blksize = 400 +timeout = 6 +filename = /%TESTNUMBER diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c index 841d08d97..dbf3f2ca7 100644 --- a/tests/server/tftpd.c +++ b/tests/server/tftpd.c @@ -902,7 +902,7 @@ static int do_tftp(struct testcase *test, struct tftphdr *tp, ssize_t size) } /* store input protocol */ - fprintf(server, "opcode: %x\n", tp->th_opcode); + fprintf(server, "opcode = %x\n", tp->th_opcode); cp = (char *)&tp->th_stuff; filename = cp; @@ -930,7 +930,7 @@ static int do_tftp(struct testcase *test, struct tftphdr *tp, ssize_t size) } if(toggle) /* name/value pair: */ - fprintf(server, "%s: %s\n", option, cp); + fprintf(server, "%s = %s\n", option, cp); else { /* store the name pointer */ option = cp; @@ -949,7 +949,7 @@ static int do_tftp(struct testcase *test, struct tftphdr *tp, ssize_t size) } /* store input protocol */ - fprintf(server, "filename: %s\n", filename); + fprintf(server, "filename = %s\n", filename); for(cp = mode; cp && *cp; cp++) if(ISUPPER(*cp)) -- cgit v1.2.1