aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Borg <jakob@kastelo.net>2024-02-11 09:20:29 +0100
committerGitHub <noreply@github.com>2024-02-11 09:20:29 +0100
commitad81ac8da71bad17139ecd6c48eb461d484a5248 (patch)
tree499e23a3c502b8e009b3816b8a6c1bdabd05f90d
parent7ebeaefe77d80df735622e4d8718a8c5614f0ecb (diff)
downloadsyncthing-ad81ac8da71bad17139ecd6c48eb461d484a5248.tar.gz
syncthing-ad81ac8da71bad17139ecd6c48eb461d484a5248.zip
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...
-rw-r--r--lib/api/api_test.go13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/api/api_test.go b/lib/api/api_test.go
index 8fac8a84d..cfdcb4234 100644
--- a/lib/api/api_test.go
+++ b/lib/api/api_test.go
@@ -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