From 7d56d2e50d583d846cfbc9ff3d0f0bafca203531 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Thu, 7 Sep 2023 23:32:41 -0700 Subject: [PATCH] test: minor test cleanups Remove an obsolete block of code in tests 2032 & 576. Add a comment in test 1474. --- tests/data/test1474 | 4 +++- tests/libtest/lib576.c | 9 ++------- tests/libtest/libntlmconnect.c | 6 ------ 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/tests/data/test1474 b/tests/data/test1474 index 2fe93200cc..8ca2cb8cc3 100644 --- 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. HTTP diff --git a/tests/libtest/lib576.c b/tests/libtest/lib576.c index f6839e7f81..7bc4750879 100644 --- 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 9f1c1315f8..fc7c784d35 100644 --- 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; -- 2.47.2