From 61c8f1edc342276763d8baae05aa787e7caf4f75 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Fri, 29 Sep 2023 15:27:21 -0700 Subject: [PATCH] tests: set --expect100-timeout to improve test reliability On an overloaded server, the default 1 second timeout can go by without the test server having a chance to respond with the expected headers, causing tests to fail. Increase the 1 second timeout to 99 seconds so this failure mode is no longer a problem on test 1129. Some other tests already set a high value, but make them consistently 99 seconds so if something goes wrong the test is stalled for less time. Ref: #11328 --- tests/data/test1070 | 2 +- tests/data/test1129 | 2 +- tests/data/test1130 | 2 +- tests/data/test1131 | 2 +- tests/data/test357 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/data/test1070 b/tests/data/test1070 index 1f5d6cf94d..18c2df3adc 100644 --- a/tests/data/test1070 +++ b/tests/data/test1070 @@ -32,7 +32,7 @@ http HTTP POST with server closing connection before (all) data is received - -d @%LOGDIR/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue" +-d @%LOGDIR/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue" This creates the named file with this content before the test case is run, diff --git a/tests/data/test1129 b/tests/data/test1129 index a649a38e9d..41b295563a 100644 --- a/tests/data/test1129 +++ b/tests/data/test1129 @@ -51,7 +51,7 @@ http HTTP POST expect 100-continue with a 404 --d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 +-d @%LOGDIR/file%TESTNUMBER --expect100-timeout 99 http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 diff --git a/tests/data/test1130 b/tests/data/test1130 index 133363de1a..bdab216d81 100644 --- a/tests/data/test1130 +++ b/tests/data/test1130 @@ -52,7 +52,7 @@ http HTTP POST forced expect 100-continue with a 404 --d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue" --expect100-timeout 999 +-d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue" --expect100-timeout 99 diff --git a/tests/data/test1131 b/tests/data/test1131 index b5e738802c..20ad5cfd85 100644 --- a/tests/data/test1131 +++ b/tests/data/test1131 @@ -52,7 +52,7 @@ http HTTP PUT expect 100-continue with a 400 --H "Expect: 100-continue" -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 --expect100-timeout 999 +-H "Expect: 100-continue" -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 --expect100-timeout 99 diff --git a/tests/data/test357 b/tests/data/test357 index fcd4b96446..e7e4e6160a 100644 --- a/tests/data/test357 +++ b/tests/data/test357 @@ -51,7 +51,7 @@ http HTTP PUT with Expect: 100-continue and 417 response -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --expect100-timeout 999 +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --expect100-timeout 99 # 1053700 x 'x', large enough to invoke the 100-continue behaviour