From f19baf27ebf89bea3768471be3c89772dc8a0be5 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Tue, 9 May 2017 19:49:17 +0200 Subject: [PATCH] tests: make test file names more unique 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. --- tests/data/test1104 | 2 +- tests/data/test1900 | 4 ++-- tests/data/test1901 | 4 ++-- tests/data/test1902 | 4 ++-- tests/data/test1903 | 4 ++-- tests/data/test216 | 4 ++-- tests/data/test256 | 6 +++--- tests/data/test38 | 6 +++--- tests/data/test569 | 4 ++-- tests/data/test571 | 4 ++-- tests/data/test87 | 4 ++-- tests/libtest/lib1900.c | 2 +- tests/server/fake_ntlm.c | 24 ++++++++++++++---------- 13 files changed, 38 insertions(+), 34 deletions(-) diff --git a/tests/data/test1104 b/tests/data/test1104 index 21efe3c15..102d52282 100644 --- a/tests/data/test1104 +++ b/tests/data/test1104 @@ -59,7 +59,7 @@ http HTTP cookie expiry date at Jan 1 00:00:00 GMT 1970 -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 diff --git a/tests/data/test1900 b/tests/data/test1900 index 04c59a826..2e3c93a0d 100644 --- a/tests/data/test1900 +++ b/tests/data/test1900 @@ -42,9 +42,9 @@ lib1900 HTTP GET using pipelining -http://%HOSTIP:%HTTPPIPEPORT/ +http://%HOSTIP:%HTTPPIPEPORT/ log/urls1900.txt - + 0 1k.txt 1000 100k.txt 0 1k.txt diff --git a/tests/data/test1901 b/tests/data/test1901 index 17c04d14e..83cdf7290 100644 --- a/tests/data/test1901 +++ b/tests/data/test1901 @@ -43,9 +43,9 @@ lib1900 HTTP GET using pipelining, blacklisted site -http://%HOSTIP:%HTTPPIPEPORT/ +http://%HOSTIP:%HTTPPIPEPORT/ log/urls1901.txt - + blacklist_site 127.0.0.1:%HTTPPIPEPORT 0 1k.txt 1000 100k.txt diff --git a/tests/data/test1902 b/tests/data/test1902 index 533ed55a8..3c999316b 100644 --- a/tests/data/test1902 +++ b/tests/data/test1902 @@ -43,9 +43,9 @@ lib1900 HTTP GET using pipelining, broken pipe -http://%HOSTIP:%HTTPPIPEPORT/ +http://%HOSTIP:%HTTPPIPEPORT/ log/urls1902.txt - + 0 1k.txt 1000 connection_close.txt 1 1k.txt diff --git a/tests/data/test1903 b/tests/data/test1903 index c72561838..219ffe11c 100644 --- a/tests/data/test1903 +++ b/tests/data/test1903 @@ -43,9 +43,9 @@ lib1900 HTTP GET using pipelining, penalized on content-length -http://%HOSTIP:%HTTPPIPEPORT/ +http://%HOSTIP:%HTTPPIPEPORT/ log/urls1903.txt - + 0 1k.txt 1000 100k.txt 550 alphabet.txt diff --git a/tests/data/test216 b/tests/data/test216 index 0c4de0a63..404e9c98a 100644 --- a/tests/data/test216 +++ b/tests/data/test216 @@ -18,7 +18,7 @@ ftp FTP upload two files to the same dir --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 upload this file twice @@ -38,7 +38,7 @@ EPSV TYPE I STOR upload.216 EPSV -STOR ..anotherup +STOR ..anotherup.216 QUIT diff --git a/tests/data/test256 b/tests/data/test256 index 2b96ecf3d..17ae807d1 100644 --- a/tests/data/test256 +++ b/tests/data/test256 @@ -29,9 +29,9 @@ http HTTP resume request over proxy with auth without server supporting it --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 - + This text is here to simulate a partly downloaded file to resume download on. @@ -56,7 +56,7 @@ Proxy-Connection: Keep-Alive # the download target file must remain untouched - + This text is here to simulate a partly downloaded file to resume download on. diff --git a/tests/data/test38 b/tests/data/test38 index 848150a33..db257f2f8 100644 --- a/tests/data/test38 +++ b/tests/data/test38 @@ -28,9 +28,9 @@ http HTTP resume request without server supporting it -http://%HOSTIP:%HTTPPORT/want/38 -C - --no-include -o log/fewl.txt +http://%HOSTIP:%HTTPPORT/want/38 -C - --no-include -o log/fewl38.txt - + This text is here to simulate a partly downloaded file to resume download on. @@ -53,7 +53,7 @@ Accept: */* # the download target file must remain untouched - + This text is here to simulate a partly downloaded file to resume download on. diff --git a/tests/data/test569 b/tests/data/test569 index c4c62a4c3..ea6cd0bb0 100644 --- a/tests/data/test569 +++ b/tests/data/test569 @@ -66,7 +66,7 @@ lib569 RTSP Session ID parsing -rtsp://%HOSTIP:%RTSPPORT/569 log/idfile.txt +rtsp://%HOSTIP:%RTSPPORT/569 log/idfile569.txt @@ -100,7 +100,7 @@ CSeq: 6 Session: A - + Got Session ID: [00.+1-am-aSe55ion_id\$yes-i-am\$] Got Session ID: [\$extraspaces] Got Session ID: [A] diff --git a/tests/data/test571 b/tests/data/test571 index 5e138cdf9..494ac416b 100644 --- a/tests/data/test571 +++ b/tests/data/test571 @@ -78,7 +78,7 @@ lib571 RTSP RTP Interleaving Test -rtsp://%HOSTIP:%RTSPPORT/571 log/protofile.txt +rtsp://%HOSTIP:%RTSPPORT/571 log/protofile571.txt @@ -99,7 +99,7 @@ RTP: message size 85, channel 0 RTP: message size 24, channel 1 - + $99 diff --git a/tests/data/test87 b/tests/data/test87 index 5e6aef306..ee5be78cb 100644 --- a/tests/data/test87 +++ b/tests/data/test87 @@ -40,7 +40,7 @@ http urlglob with out of range -o #[num] usage -"http://%HOSTIP:%HTTPPORT/[870001-870002]" -o "log/dumpit#2.dump" +"http://%HOSTIP:%HTTPPORT/[870001-870002]" -o "log/dumpit87-#2.dump" @@ -50,7 +50,7 @@ urlglob with out of range -o #[num] usage # survives # - + HTTP/1.1 200 OK Funny-head: yesyes Content-Length: 16 diff --git a/tests/libtest/lib1900.c b/tests/libtest/lib1900.c index d72e3e6a2..42c0ef1dd 100644 --- a/tests/libtest/lib1900.c +++ b/tests/libtest/lib1900.c @@ -142,7 +142,7 @@ int test(char *URL) int handlenum = 0; struct timeval last_handle_add; - if(parse_url_file("log/urls.txt") <= 0) + if(parse_url_file(libtest_arg2) <= 0) goto test_cleanup; start_test_timing(); diff --git a/tests/server/fake_ntlm.c b/tests/server/fake_ntlm.c index b5f375e46..0d1b3e1b6 100644 --- a/tests/server/fake_ntlm.c +++ b/tests/server/fake_ntlm.c @@ -37,11 +37,9 @@ /* include memdebug.h last */ #include "memdebug.h" -#ifndef DEFAULT_LOGFILE -#define DEFAULT_LOGFILE "log/fake_ntlm.log" -#endif +#define LOGFILE "log/fake_ntlm%d.log" -const char *serverlogfile = DEFAULT_LOGFILE; +const char *serverlogfile; /* * 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[]) { char buf[1024]; + char logfilename[256]; FILE *stream; char *filename; 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"); if(env) { char *endptr; long lnum = strtol(env, &endptr, 10); 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); } testnum = lnum; } else { - logmsg("Test number not specified in CURL_NTLM_AUTH_TESTNUM"); + fprintf(stderr, "Test number not specified in CURL_NTLM_AUTH_TESTNUM"); 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"); if(env) { path = env; @@ -276,5 +279,6 @@ int main(int argc, char *argv[]) exit(1); } } + logmsg("Exit"); return 1; }