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.
2024-12-21 23:58:49 -05:00 · 2017-05-09 19:49:17 +02:00 · 2017-05-09 19:49:17 +02:00 · f19baf27eb
commit f19baf27eb
parent f5b71d3a6c
13 changed files with 38 additions and 34 deletions
--- 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
 </name>
 <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>
 </client>

--- a/tests/data/test1900
+++ b/tests/data/test1900
@ -42,9 +42,9 @@ lib1900
 HTTP GET using pipelining
 </name>
 <command>
-http://%HOSTIP:%HTTPPIPEPORT/
+http://%HOSTIP:%HTTPPIPEPORT/ log/urls1900.txt
 </command>
-<file name="log/urls.txt">
+<file name="log/urls1900.txt">
 0 1k.txt
 1000 100k.txt
 0 1k.txt
--- a/tests/data/test1901
+++ b/tests/data/test1901
@ -43,9 +43,9 @@ lib1900
 HTTP GET using pipelining, blacklisted site
 </name>
 <command>
-http://%HOSTIP:%HTTPPIPEPORT/
+http://%HOSTIP:%HTTPPIPEPORT/ log/urls1901.txt
 </command>
-<file name="log/urls.txt">
+<file name="log/urls1901.txt">
 blacklist_site 127.0.0.1:%HTTPPIPEPORT
 0 1k.txt
 1000 100k.txt
--- a/tests/data/test1902
+++ b/tests/data/test1902
@ -43,9 +43,9 @@ lib1900
 HTTP GET using pipelining, broken pipe
 </name>
 <command>
-http://%HOSTIP:%HTTPPIPEPORT/
+http://%HOSTIP:%HTTPPIPEPORT/ log/urls1902.txt
 </command>
-<file name="log/urls.txt">
+<file name="log/urls1902.txt">
 0 1k.txt
 1000 connection_close.txt
 1 1k.txt
--- a/tests/data/test1903
+++ b/tests/data/test1903
@ -43,9 +43,9 @@ lib1900
 HTTP GET using pipelining, penalized on content-length
 </name>
 <command>
-http://%HOSTIP:%HTTPPIPEPORT/
+http://%HOSTIP:%HTTPPIPEPORT/ log/urls1903.txt
 </command>
-<file name="log/urls.txt">
+<file name="log/urls1903.txt">
 0 1k.txt
 1000 100k.txt
 550 alphabet.txt
--- a/tests/data/test216
+++ b/tests/data/test216
@ -18,7 +18,7 @@ ftp
 FTP upload two files to the same dir
 </name>
 <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>
 <file name="log/upload.216">
 upload this file twice
@ -38,7 +38,7 @@ EPSV
 TYPE I
 STOR upload.216
 EPSV
-STOR ..anotherup
+STOR ..anotherup.216
 QUIT
 </protocol>
 </verify>
--- a/tests/data/test256
+++ b/tests/data/test256
@ -29,9 +29,9 @@ http
 HTTP resume request over proxy with auth without server supporting it
 </name>
 <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>
-<file name="log/fewl.txt">
+<file name="log/fewl256.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
@ -56,7 +56,7 @@ Proxy-Connection: Keep-Alive
 </protocol>

 # 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
 download on.
 </file>
--- a/tests/data/test38
+++ b/tests/data/test38
@ -28,9 +28,9 @@ http
 HTTP resume request without server supporting it
 </name>
 <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>
-<file name="log/fewl.txt">
+<file name="log/fewl38.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
@ -53,7 +53,7 @@ Accept: */*
 </protocol>

 # 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
 download on.
 </file>
--- a/tests/data/test569
+++ b/tests/data/test569
@ -66,7 +66,7 @@ lib569
 RTSP Session ID parsing
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/569 log/idfile.txt
+rtsp://%HOSTIP:%RTSPPORT/569 log/idfile569.txt
 </command>
 </client>

@ -100,7 +100,7 @@ CSeq: 6
 Session: A

 </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: [\$extraspaces]
 Got Session ID: [A]
--- a/tests/data/test571
+++ b/tests/data/test571
@ -78,7 +78,7 @@ lib571
 RTSP RTP Interleaving Test
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/571 log/protofile.txt
+rtsp://%HOSTIP:%RTSPPORT/571 log/protofile571.txt
 </command>
 </client>

@ -99,7 +99,7 @@ RTP: message size 85, channel 0
 RTP: message size 24, channel 1
 </stdout>

-<file name="log/protofile.txt">
+<file name="log/protofile571.txt">
 $99
 </file>
 </verify>
--- a/tests/data/test87
+++ b/tests/data/test87
@ -40,7 +40,7 @@ http
 urlglob with out of range -o #[num] usage
 </name>
 <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>
 </client>

@ -50,7 +50,7 @@ urlglob with out of range -o #[num] usage
 # survives
 #
 <verify>
-<file name="log/dumpit#2.dump">
+<file name="log/dumpit87-#2.dump">
 HTTP/1.1 200 OK
 Funny-head: yesyes
 Content-Length: 16
--- 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();
--- 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;
 }