luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: add some --expect100-timeout to reduce timing dependencies

Browse Source 
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
This commit is contained in:
Dan Fandrich 2023-09-11 15:28:01 -07:00
parent f0e4fa445d
commit 2ef67901cc
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/data/test1130
View File

@ -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>

7
tests/data/test1131
View File

@ -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>

2
tests/data/test357
View File

@ -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">