Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/api: Deflake TestAPIServiceRequests (#9413) 

Somewhere along the way, the non-parallel test became parallel, and at
that point, timeouts occurred. Parallel is better, so increase the
timeout on the offending call a bit...
This commit is contained in:
Jakob Borg 2024-02-11 09:20:29 +01:00 committed by GitHub
parent 7ebeaefe77
commit ad81ac8da7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/api/api_test.go
View File

@ -225,10 +225,11 @@ func TestAPIServiceRequests(t *testing.T) {
cases := []httpTestCase{
// /rest/db
{
URL: "/rest/db/completion?device=" + protocol.LocalDeviceID.String() + "&folder=default",
Code: 200,
Type: "application/json",
Prefix: "{",
URL: "/rest/db/completion?device=" + protocol.LocalDeviceID.String() + "&folder=default",
Code: 200,
Type: "application/json",
Prefix: "{",
Timeout: 15 * time.Second,
},
{
URL: "/rest/db/file?folder=default&file=something",
@ -433,7 +434,7 @@ func TestAPIServiceRequests(t *testing.T) {
for _, tc := range cases {
tc := tc
t.Run(cases[0].URL, func(t *testing.T) {
t.Run(tc.URL, func(t *testing.T) {
t.Parallel()
testHTTPRequest(t, baseURL, tc, testAPIKey)
})
@ -443,8 +444,6 @@ func TestAPIServiceRequests(t *testing.T) {
// testHTTPRequest tries the given test case, comparing the result code,
// content type, and result prefix.
func testHTTPRequest(t *testing.T, baseURL string, tc httpTestCase, apikey string) {
// Should not be parallelized, as that just causes timeouts eventually with more test-cases
timeout := time.Second
if tc.Timeout > 0 {
timeout = tc.Timeout