moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

tests: make test file names more unique

Browse Source 
Include the test number in the names of files written out by tests to
reduce the chance of accidental duplication and to make it more clear
which test is associated with which file.
This commit is contained in:
Dan Fandrich 2017-05-09 19:49:17 +02:00
parent f5b71d3a6c
commit f19baf27eb
13 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/data/test1104
View File

@ -59,7 +59,7 @@ http
HTTP cookie expiry date at Jan 1 00:00:00 GMT 1970 HTTP cookie expiry date at Jan 1 00:00:00 GMT 1970
</name> </name>
<command> <command>
http://%HOSTIP:%HTTPPORT/want/1104 -L -x %HOSTIP:%HTTPPORT -c log/cookies.jar http://%HOSTIP:%HTTPPORT/want/1104 -L -x %HOSTIP:%HTTPPORT -c log/cookies1104.jar
</command> </command>
</client> </client>

4
tests/data/test1900
View File

@ -42,9 +42,9 @@ lib1900
HTTP GET using pipelining HTTP GET using pipelining
</name> </name>
<command> <command>
http://%HOSTIP:%HTTPPIPEPORT/ http://%HOSTIP:%HTTPPIPEPORT/ log/urls1900.txt
</command> </command>
<file name="log/urls.txt"> <file name="log/urls1900.txt">
0 1k.txt 0 1k.txt
1000 100k.txt 1000 100k.txt
0 1k.txt 0 1k.txt

4
tests/data/test1901
View File

@ -43,9 +43,9 @@ lib1900
HTTP GET using pipelining, blacklisted site HTTP GET using pipelining, blacklisted site
</name> </name>
<command> <command>
http://%HOSTIP:%HTTPPIPEPORT/ http://%HOSTIP:%HTTPPIPEPORT/ log/urls1901.txt
</command> </command>
<file name="log/urls.txt"> <file name="log/urls1901.txt">
blacklist_site 127.0.0.1:%HTTPPIPEPORT blacklist_site 127.0.0.1:%HTTPPIPEPORT
0 1k.txt 0 1k.txt
1000 100k.txt 1000 100k.txt

4
tests/data/test1902
View File

@ -43,9 +43,9 @@ lib1900
HTTP GET using pipelining, broken pipe HTTP GET using pipelining, broken pipe
</name> </name>
<command> <command>
http://%HOSTIP:%HTTPPIPEPORT/ http://%HOSTIP:%HTTPPIPEPORT/ log/urls1902.txt
</command> </command>
<file name="log/urls.txt"> <file name="log/urls1902.txt">
0 1k.txt 0 1k.txt
1000 connection_close.txt 1000 connection_close.txt
1 1k.txt 1 1k.txt

4
tests/data/test1903
View File

@ -43,9 +43,9 @@ lib1900
HTTP GET using pipelining, penalized on content-length HTTP GET using pipelining, penalized on content-length
</name> </name>
<command> <command>
http://%HOSTIP:%HTTPPIPEPORT/ http://%HOSTIP:%HTTPPIPEPORT/ log/urls1903.txt
</command> </command>
<file name="log/urls.txt"> <file name="log/urls1903.txt">
0 1k.txt 0 1k.txt
1000 100k.txt 1000 100k.txt
550 alphabet.txt 550 alphabet.txt

4
tests/data/test216
View File

@ -18,7 +18,7 @@ ftp
FTP upload two files to the same dir FTP upload two files to the same dir
</name> </name>
<command> <command>
-T log/upload.216 ftp://%HOSTIP:%FTPPORT/a/path/216/ -T log/upload.216 ftp://%HOSTIP:%FTPPORT/a/path/216/%2e%2eanotherup -T log/upload.216 ftp://%HOSTIP:%FTPPORT/a/path/216/ -T log/upload.216 ftp://%HOSTIP:%FTPPORT/a/path/216/%2e%2eanotherup.216
</command> </command>
<file name="log/upload.216"> <file name="log/upload.216">
upload this file twice upload this file twice
@ -38,7 +38,7 @@ EPSV
TYPE I TYPE I
STOR upload.216 STOR upload.216
EPSV EPSV
STOR ..anotherup STOR ..anotherup.216
QUIT QUIT
</protocol> </protocol>
</verify> </verify>

6
tests/data/test256
View File

@ -29,9 +29,9 @@ http
HTTP resume request over proxy with auth without server supporting it HTTP resume request over proxy with auth without server supporting it
</name> </name>
<command option="no-output"> <command option="no-output">
-x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/256 -C - --no-include -o log/fewl.txt -U daniel:stenberg -x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/256 -C - --no-include -o log/fewl256.txt -U daniel:stenberg
</command> </command>
<file name="log/fewl.txt"> <file name="log/fewl256.txt">
This text is here to simulate a partly downloaded file to resume This text is here to simulate a partly downloaded file to resume
download on. download on.
</file> </file>
@ -56,7 +56,7 @@ Proxy-Connection: Keep-Alive
</protocol> </protocol>
# the download target file must remain untouched # the download target file must remain untouched
<file name="log/fewl.txt"> <file name="log/fewl256.txt">
This text is here to simulate a partly downloaded file to resume This text is here to simulate a partly downloaded file to resume
download on. download on.
</file> </file>

6
tests/data/test38
View File

@ -28,9 +28,9 @@ http
HTTP resume request without server supporting it HTTP resume request without server supporting it
</name> </name>
<command option="no-output"> <command option="no-output">
http://%HOSTIP:%HTTPPORT/want/38 -C - --no-include -o log/fewl.txt http://%HOSTIP:%HTTPPORT/want/38 -C - --no-include -o log/fewl38.txt
</command> </command>
<file name="log/fewl.txt"> <file name="log/fewl38.txt">
This text is here to simulate a partly downloaded file to resume This text is here to simulate a partly downloaded file to resume
download on. download on.
</file> </file>
@ -53,7 +53,7 @@ Accept: */*
</protocol> </protocol>
# the download target file must remain untouched # the download target file must remain untouched
<file name="log/fewl.txt"> <file name="log/fewl38.txt">
This text is here to simulate a partly downloaded file to resume This text is here to simulate a partly downloaded file to resume
download on. download on.
</file> </file>

4
tests/data/test569
View File

@ -66,7 +66,7 @@ lib569
RTSP Session ID parsing RTSP Session ID parsing
</name> </name>
<command> <command>
rtsp://%HOSTIP:%RTSPPORT/569 log/idfile.txt rtsp://%HOSTIP:%RTSPPORT/569 log/idfile569.txt
</command> </command>
</client> </client>
@ -100,7 +100,7 @@ CSeq: 6
Session: A Session: A
</protocol> </protocol>
<file name="log/idfile.txt"> <file name="log/idfile569.txt">
Got Session ID: [00.+1-am-aSe55ion_id\$yes-i-am\$] Got Session ID: [00.+1-am-aSe55ion_id\$yes-i-am\$]
Got Session ID: [\$extraspaces] Got Session ID: [\$extraspaces]
Got Session ID: [A] Got Session ID: [A]

4
tests/data/test571
View File

@ -78,7 +78,7 @@ lib571
RTSP RTP Interleaving Test RTSP RTP Interleaving Test
</name> </name>
<command> <command>
rtsp://%HOSTIP:%RTSPPORT/571 log/protofile.txt rtsp://%HOSTIP:%RTSPPORT/571 log/protofile571.txt
</command> </command>
</client> </client>
@ -99,7 +99,7 @@ RTP: message size 85, channel 0
RTP: message size 24, channel 1 RTP: message size 24, channel 1
</stdout> </stdout>
<file name="log/protofile.txt"> <file name="log/protofile571.txt">
$99 $99
</file> </file>
</verify> </verify>

4
tests/data/test87
View File

@ -40,7 +40,7 @@ http
urlglob with out of range -o #[num] usage urlglob with out of range -o #[num] usage
</name> </name>
<command option="no-output"> <command option="no-output">
"http://%HOSTIP:%HTTPPORT/[870001-870002]" -o "log/dumpit#2.dump" "http://%HOSTIP:%HTTPPORT/[870001-870002]" -o "log/dumpit87-#2.dump"
</command> </command>
</client> </client>
@ -50,7 +50,7 @@ urlglob with out of range -o #[num] usage
# survives # survives
# #
<verify> <verify>
<file name="log/dumpit#2.dump"> <file name="log/dumpit87-#2.dump">
HTTP/1.1 200 OK HTTP/1.1 200 OK
Funny-head: yesyes Funny-head: yesyes
Content-Length: 16 Content-Length: 16

2
tests/libtest/lib1900.c
View File

@ -142,7 +142,7 @@ int test(char *URL)
int handlenum = 0; int handlenum = 0;
struct timeval last_handle_add; struct timeval last_handle_add;
if(parse_url_file("log/urls.txt") <= 0) if(parse_url_file(libtest_arg2) <= 0)
goto test_cleanup; goto test_cleanup;
start_test_timing(); start_test_timing();

24
tests/server/fake_ntlm.c
View File

@ -37,11 +37,9 @@
/* include memdebug.h last */ /* include memdebug.h last */
#include "memdebug.h" #include "memdebug.h"
#ifndef DEFAULT_LOGFILE #define LOGFILE "log/fake_ntlm%d.log"
#define DEFAULT_LOGFILE "log/fake_ntlm.log"
#endif
const char *serverlogfile = DEFAULT_LOGFILE; const char *serverlogfile;
/* /*
* Returns an allocated buffer with printable representation of input * Returns an allocated buffer with printable representation of input
@ -111,6 +109,7 @@ static char *printable(char *inbuf, size_t inlength)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char buf[1024]; char buf[1024];
char logfilename[256];
FILE *stream; FILE *stream;
char *filename; char *filename;
int error; int error;
@ -158,25 +157,29 @@ int main(int argc, char *argv[])
} }
} }
logmsg("fake_ntlm (user: %s) (proto: %s) (domain: %s) (cached creds: %s)",
helper_user, helper_proto, helper_domain,
(use_cached_creds) ? "yes" : "no");
env = getenv("CURL_NTLM_AUTH_TESTNUM"); env = getenv("CURL_NTLM_AUTH_TESTNUM");
if(env) { if(env) {
char *endptr; char *endptr;
long lnum = strtol(env, &endptr, 10); long lnum = strtol(env, &endptr, 10);
if((endptr != env + strlen(env)) || (lnum < 1L)) { if((endptr != env + strlen(env)) || (lnum < 1L)) {
logmsg("Test number not valid in CURL_NTLM_AUTH_TESTNUM"); fprintf(stderr, "Test number not valid in CURL_NTLM_AUTH_TESTNUM");
exit(1); exit(1);
} }
testnum = lnum; testnum = lnum;
} }
else { else {
logmsg("Test number not specified in CURL_NTLM_AUTH_TESTNUM"); fprintf(stderr, "Test number not specified in CURL_NTLM_AUTH_TESTNUM");
exit(1); exit(1);
} }
/* logmsg cannot be used until this file name is set */
snprintf(logfilename, sizeof(logfilename), LOGFILE, testnum);
serverlogfile = logfilename;
logmsg("fake_ntlm (user: %s) (proto: %s) (domain: %s) (cached creds: %s)",
helper_user, helper_proto, helper_domain,
(use_cached_creds) ? "yes" : "no");
env = getenv("CURL_NTLM_AUTH_SRCDIR"); env = getenv("CURL_NTLM_AUTH_SRCDIR");
if(env) { if(env) {
path = env; path = env;
@ -276,5 +279,6 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
} }
logmsg("Exit");
return 1; return 1;
} }