From: Viktor Szakats Date: Tue, 16 Apr 2024 07:52:23 +0000 (+0200) Subject: tidy-up: whitespace [ci skip] X-Git-Tag: curl-8_8_0~222 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f81f60206d95b294297f66196405666f5e8ece2c;p=thirdparty%2Fcurl.git tidy-up: whitespace [ci skip] --- diff --git a/docs/ECH.md b/docs/ECH.md index cfb897d4e5..53bc60afc6 100644 --- a/docs/ECH.md +++ b/docs/ECH.md @@ -476,4 +476,3 @@ and then re-use that in another invocation. Both our OpenSSL fork and boringssl have APIs for both controlling GREASE and accessing and logging ``retry_configs``, it seems WolfSSL has neither. - diff --git a/tests/ech_combos.py b/tests/ech_combos.py index 7f41198671..66daaa373d 100755 --- a/tests/ech_combos.py +++ b/tests/ech_combos.py @@ -27,16 +27,16 @@ # Python3 program to print all combination of size r in an array of size n. # This is used to generate test lines in tests/ech_test.sh. # This will be discarded in the process of moving from experimental, -# but is worth preserving for the moment in case of changes to the +# but is worth preserving for the moment in case of changes to the # ECH command line args def CombinationRepetitionUtil(chosen, arr, badarr, index, r, start, end): - + # Current combination is ready, # print it if index == r: - # figure out if result should be good or bad and + # figure out if result should be good or bad and # print prefix, assuming $turl does support ECH so # should work if given "positive" parameters res = 1 @@ -51,19 +51,19 @@ def CombinationRepetitionUtil(chosen, arr, badarr, index, for j in range(r): if j != 0 and chosen[j] != chosen[j-1]: print(chosen[j], end = " ") - + print() return - + # When no more elements are # there to put in chosen[] if start > n: return - + # Current is included, put # next at next location chosen[index] = arr[start] - + # Current is excluded, replace it # with next (Note that i+1 is passed, # but index is not changed) @@ -77,7 +77,7 @@ def CombinationRepetitionUtil(chosen, arr, badarr, index, # size n. This function mainly uses # CombinationRepetitionUtil() def CombinationRepetition(arr, badarr, n, r): - + # A temporary array to store # all combination one by one chosen = [0] * r @@ -96,4 +96,3 @@ n = len(arr) - 1 CombinationRepetition(arr, badarr, n, r) # This code is contributed by Vaibhav Kumar 12. - diff --git a/tests/ech_tests.sh b/tests/ech_tests.sh index df8e45b12b..2e8b38b346 100755 --- a/tests/ech_tests.sh +++ b/tests/ech_tests.sh @@ -356,7 +356,7 @@ then # basic ECH good/bad for targ in "${!ech_targets[@]}" do - if [[ "$using_wolf" == "yes" ]] + if [[ "$using_wolf" == "yes" ]] then case $targ in "draft-13.esni.defo.ie:8414" | "tls-ech.dev" | \ @@ -376,7 +376,7 @@ do path=${ech_targets[$targ]} turl="https://$host:$port/$path" echo "ECH check for $turl" - { + { echo "" echo "ECH check for $turl" } >> "$logfile" @@ -415,7 +415,7 @@ then path=${ech_targets[$targ]} turl="https://$host:$port/$path" echo "PN override check for $turl" - { + { echo "" echo "PN override check for $turl" } >> "$logfile" @@ -553,7 +553,7 @@ then echo "more cli_test with $turl" >> "$logfile" # The combinatorics here are handled via the tests/ech_combos.py script - # which produces all the relevant combinations or inputs and orders + # which produces all the relevant combinations or inputs and orders # thereof. We have to manually assess whether or not ECH is expected to # work for each case. cli_test "$turl" 0 0 @@ -1148,4 +1148,3 @@ fi # add to list of bad runs (updating file age) echo "ECH badness at $NOW" >>"$LTOP"/bad_runs exit 2 - diff --git a/tests/http/test_01_basic.py b/tests/http/test_01_basic.py index 3902b75b7c..54e7dd4a70 100644 --- a/tests/http/test_01_basic.py +++ b/tests/http/test_01_basic.py @@ -97,5 +97,3 @@ class TestBasic: r.check_stats(http_status=200, count=1) assert r.stats[0]['time_connect'] > 0, f'{r.stats[0]}' assert r.stats[0]['time_appconnect'] > 0, f'{r.stats[0]}' - - diff --git a/tests/http/test_02_download.py b/tests/http/test_02_download.py index 34b863f3c0..00b4a04a4a 100644 --- a/tests/http/test_02_download.py +++ b/tests/http/test_02_download.py @@ -495,4 +495,3 @@ class TestDownload: r.check_exit_code(0) srcfile = os.path.join(httpd.docs_dir, docname) self.check_downloads(client, srcfile, count) - diff --git a/tests/http/test_05_errors.py b/tests/http/test_05_errors.py index 68e49f7362..1aa8ae6b0a 100644 --- a/tests/http/test_05_errors.py +++ b/tests/http/test_05_errors.py @@ -134,4 +134,3 @@ class TestErrors: else: r.check_exit_code(0) r.check_response(http_status=200, count=count) - diff --git a/tests/http/test_07_upload.py b/tests/http/test_07_upload.py index 1c3bfb0175..1aa51d0710 100644 --- a/tests/http/test_07_upload.py +++ b/tests/http/test_07_upload.py @@ -542,4 +542,3 @@ class TestUpload: '--expect100-timeout', f'{read_delay-1}' ]) r.check_stats(count=1, http_status=200, exitcode=0) - diff --git a/tests/http/test_10_proxy.py b/tests/http/test_10_proxy.py index c191432fb0..1be8d35014 100644 --- a/tests/http/test_10_proxy.py +++ b/tests/http/test_10_proxy.py @@ -368,4 +368,3 @@ class TestProxy: else: r.check_response(count=1, http_status=200, protocol='HTTP/2' if proto == 'h2' else 'HTTP/1.1') - diff --git a/tests/http/test_16_info.py b/tests/http/test_16_info.py index 07ed2ba4d2..b5459abf75 100644 --- a/tests/http/test_16_info.py +++ b/tests/http/test_16_info.py @@ -159,4 +159,4 @@ class TestInfo: f'greater than "time_starttransfer", {s}' # assert that transfer start is before total assert s['time_starttransfer'] <= s['time_total'], f'"time_starttransfer" '\ - f'greater than "time_total", {s}' \ No newline at end of file + f'greater than "time_total", {s}'