test: minor test cleanups

Remove an obsolete block of code in tests 2032 & 576.
Add a comment in test 1474.

diff --git a/tests/data/test1474 b/tests/data/test1474
index 2fe93200cc695c22eebbd5ef43486a5ebad9fb4e..8ca2cb8cc34a2af3e226f4fd7dcc55eb69fe28dc 100644 (file)
--- a/tests/data/test1474
+++ b/tests/data/test1474
@@ -23,7 +23,9 @@
 # builds which are often run on overloaded servers.
 # Increasing the --limit-rate would decrease the test time, but at the cost of
 # becoming even more sensitive to delays (going from 500 msec to 250 msec or
-# less of accepted delay before failure).
+# less of accepted delay before failure).  Adding a --speed-time would increase
+# the 1 second delay between writes to longer, but it would also increase the
+# total time needed by the test, which is already quite high.
 <info>
 <keywords>
 HTTP

diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c
index f6839e7f81939aeffb57dc5f21131a360d573dec..7bc4750879414b09a636fd8f26d5475f104d224e 100644 (file)
--- a/tests/libtest/lib576.c
+++ b/tests/libtest/lib576.c
@@ -31,11 +31,6 @@ struct chunk_data {
   int print_content;
 };
 
-static
-long chunk_bgn(const struct curl_fileinfo *finfo, void *ptr, int remains);
-static
-long chunk_end(void *ptr);
-
 static
 long chunk_bgn(const struct curl_fileinfo *finfo, void *ptr, int remains)
 {
@@ -76,8 +71,8 @@ long chunk_bgn(const struct curl_fileinfo *finfo, void *ptr, int remains)
   }
   if(finfo->filetype == CURLFILETYPE_FILE) {
     ch_d->print_content = 1;
-    printf("Content:\n-----------------------"
-           "--------------------------------------\n");
+    printf("Content:\n"
+      "-------------------------------------------------------------\n");
   }
   if(strcmp(finfo->filename, "someothertext.txt") == 0) {
     printf("# THIS CONTENT WAS SKIPPED IN CHUNK_BGN CALLBACK #\n");

diff --git a/tests/libtest/libntlmconnect.c b/tests/libtest/libntlmconnect.c
index 9f1c1315f8b786e732bb2ac55d88fa94503f6abc..fc7c784d35e0e46441247c64fd6635aa67a5868b 100644 (file)
--- a/tests/libtest/libntlmconnect.c
+++ b/tests/libtest/libntlmconnect.c
@@ -119,12 +119,6 @@ int test(char *url)
 
   multi_init(multi);
 
-#ifdef USE_PIPELINING
-  multi_setopt(multi, CURLMOPT_PIPELINING, 1L);
-  multi_setopt(multi, CURLMOPT_MAX_HOST_CONNECTIONS, 5L);
-  multi_setopt(multi, CURLMOPT_MAX_TOTAL_CONNECTIONS, 10L);
-#endif
-
   for(;;) {
     struct timeval interval;
     fd_set fdread;