From ebe0f498d85882dca93154ef9e3fc8b6c4b7127a Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Tue, 11 Jan 2022 21:05:39 +0300 Subject: tests: simplified libcurl HTTP settings --- src/testcurl/test_add_conn.c | 9 ++++---- src/testcurl/test_get_close_keep_alive.c | 9 ++++---- src/testcurl/test_large_put.c | 37 +++++++++++++++----------------- src/testcurl/test_toolarge.c | 9 ++++---- src/testcurl/test_tricky.c | 9 ++++---- 5 files changed, 33 insertions(+), 40 deletions(-) diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c index 49e2c9a9..746ecbaf 100644 --- a/src/testcurl/test_add_conn.c +++ b/src/testcurl/test_add_conn.c @@ -446,11 +446,10 @@ curlEasyInitForTest (const char *queryPath, int port, struct CBC *pcbc) (CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT, (long) response_timeout_val)) || (CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) || - ((oneone) ? - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_1)) : - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_0)))) + (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, + (oneone) ? + CURL_HTTP_VERSION_1_1 : + CURL_HTTP_VERSION_1_0))) { fprintf (stderr, "curl_easy_setopt() failed.\n"); _exit (99); diff --git a/src/testcurl/test_get_close_keep_alive.c b/src/testcurl/test_get_close_keep_alive.c index 53911f5b..2fca0ce3 100644 --- a/src/testcurl/test_get_close_keep_alive.c +++ b/src/testcurl/test_get_close_keep_alive.c @@ -422,11 +422,10 @@ curlEasyInitForTest (const char *queryPath, int port, struct CBC *pcbc, (CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA, hdr_chk_result)) || (CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) || - ((oneone) ? - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_1)) : - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_0)))) + (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, + (oneone) ? + CURL_HTTP_VERSION_1_1 : + CURL_HTTP_VERSION_1_0))) { fprintf (stderr, "curl_easy_setopt() failed.\n"); externalErrorExit (); diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c index 9c26adbd..b00d0e1a 100644 --- a/src/testcurl/test_large_put.c +++ b/src/testcurl/test_large_put.c @@ -365,11 +365,11 @@ testPutInternalThread (unsigned int add_flag) (long) 150)) || (CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT, (long) 150)) || - ((oneone) ? - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_1)) : - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_0)))) + (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, + (oneone) ? + CURL_HTTP_VERSION_1_1 : + CURL_HTTP_VERSION_1_0))) + { fprintf (stderr, "curl_easy_setopt() failed.\n"); externalErrorExit (); @@ -471,11 +471,10 @@ testPutThreadPerConn (unsigned int add_flag) (long) 150)) || (CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT, (long) 150)) || - ((oneone) ? - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_1)) : - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_0)))) + (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, + (oneone) ? + CURL_HTTP_VERSION_1_1 : + CURL_HTTP_VERSION_1_0))) { fprintf (stderr, "curl_easy_setopt() failed.\n"); externalErrorExit (); @@ -577,11 +576,10 @@ testPutThreadPool (unsigned int add_flag) (long) 150)) || (CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT, (long) 150)) || - ((oneone) ? - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_1)) : - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_0)))) + (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, + (oneone) ? + CURL_HTTP_VERSION_1_1 : + CURL_HTTP_VERSION_1_0))) { fprintf (stderr, "curl_easy_setopt() failed.\n"); externalErrorExit (); @@ -689,11 +687,10 @@ testPutExternal (void) (long) 150)) || (CURLE_OK != curl_easy_setopt (c, CURLOPT_TIMEOUT, (long) 150)) || - ((oneone) ? - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_1)) : - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_0)))) + (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, + (oneone) ? + CURL_HTTP_VERSION_1_1 : + CURL_HTTP_VERSION_1_0))) { fprintf (stderr, "curl_easy_setopt() failed.\n"); externalErrorExit (); diff --git a/src/testcurl/test_toolarge.c b/src/testcurl/test_toolarge.c index 7cbb1545..6f78d7ba 100644 --- a/src/testcurl/test_toolarge.c +++ b/src/testcurl/test_toolarge.c @@ -577,11 +577,10 @@ curlEasyInitForTest (const char *queryPath, const char *method, (CURLE_OK != curl_easy_setopt (c, CURLOPT_HEADERDATA, hdr_chk_result)) || (CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) || - ((oneone) ? - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_1)) : - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_0)))) + (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, + (oneone) ? + CURL_HTTP_VERSION_1_1 : + CURL_HTTP_VERSION_1_0))) libcurlErrorExitDesc ("curl_easy_setopt() failed"); if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, method)) diff --git a/src/testcurl/test_tricky.c b/src/testcurl/test_tricky.c index b926884f..50af68a1 100644 --- a/src/testcurl/test_tricky.c +++ b/src/testcurl/test_tricky.c @@ -500,11 +500,10 @@ curlEasyInitForTest (struct curlQueryParams *p, (long) 1)) || #endif /* CURL_AT_LEAST_VERSION(7, 42, 0) */ (CURLE_OK != curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L)) || - ((oneone) ? - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_1)) : - (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, - CURL_HTTP_VERSION_1_0)))) + (CURLE_OK != curl_easy_setopt (c, CURLOPT_HTTP_VERSION, + (oneone) ? + CURL_HTTP_VERSION_1_1 : + CURL_HTTP_VERSION_1_0))) libcurlErrorExitDesc ("curl_easy_setopt() failed"); if (CURLE_OK != curl_easy_setopt (c, CURLOPT_CUSTOMREQUEST, p->method)) -- cgit v1.2.3