From 2ef67901cc336406641c3fbd312e5a711d11b711 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Mon, 11 Sep 2023 15:28:01 -0700
Subject: [PATCH] tests: add some --expect100-timeout to reduce timing
 dependencies

These tests can fail when the test machine is so slow that the test HTTP
server didn't get a chance to complete before the client's one second
100-continue timeout triggered. Increase that 1 second to 999 seconds so
this situation doesn't happen.

Ref: #11328
---
 tests/data/test1130 | 7 ++++---
 tests/data/test1131 | 7 ++++---
 tests/data/test357  | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/data/test1130 b/tests/data/test1130
index 233562546a..1107941896 100644
--- a/tests/data/test1130
+++ b/tests/data/test1130
@@ -30,8 +30,9 @@ Content-Type: text/html
 -foo-
 </data1>
 
-# we use skip to make the test server never read the full payload off
-# the socket and instead return the response at once
+# We use skip to make the test server never read the full payload off
+# the socket and instead return the response at once. In actuality, the
+# long --expect100-timeout means that it will never get a chance to read this.
 <servercmd>
 skip: 100
 </servercmd>
@@ -51,7 +52,7 @@ http
 HTTP POST forced expect 100-continue with a 404
  </name>
  <command option="no-output">
--d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue"
+-d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue" --expect100-timeout 999
 </command>
 </client>
 
diff --git a/tests/data/test1131 b/tests/data/test1131
index 3235bf5df4..5725e71eb8 100644
--- a/tests/data/test1131
+++ b/tests/data/test1131
@@ -30,8 +30,9 @@ Content-Type: text/html
 FAILURE2
 </data1>
 
-# we use skip to make the test server never read the full payload off
-# the socket and instead return the response at once
+# We use skip to make the test server never read the full payload off
+# the socket and instead return the response at once. In actuality, the
+# long --expect100-timeout means that it will never get a chance to read this.
 <servercmd>
 skip: 100
 </servercmd>
@@ -51,7 +52,7 @@ http
 HTTP PUT expect 100-continue with a 400
  </name>
  <command option="no-output">
--H "Expect: 100-continue" -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
+-H "Expect: 100-continue" -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 --expect100-timeout 999
 </command>
 </client>
 
diff --git a/tests/data/test357 b/tests/data/test357
index 445000768c..5d1f456a3b 100644
--- a/tests/data/test357
+++ b/tests/data/test357
@@ -51,7 +51,7 @@ http
 HTTP PUT with Expect: 100-continue and 417 response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --expect100-timeout 999
 </command>
 # 1053700 x 'x', large enough to invoke the 100-continue behaviour
 <file name="%LOGDIR/test%TESTNUMBER.txt">
-- 
2.47.2