vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e2e: submitConcurrentWatch runs with ExecuteWithTimeout 

Use testutils.ExecuteWithTimeout to make sure that the all active
streams are ready in time.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
dependabot/go_modules/go.uber.org/atomic-1.10.0
Wei Fu 2022-09-20 11:03:51 +08:00
parent ec847337d7
commit 16884373b9
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/e2e/v3_curl_maxstream_test.go
View File

@ -28,6 +28,7 @@ import (
pb "go.etcd.io/etcd/api/v3/etcdserverpb"
"go.etcd.io/etcd/client/pkg/v3/testutil"
"go.etcd.io/etcd/tests/v3/framework/e2e"
"go.etcd.io/etcd/tests/v3/framework/testutils"
)
// NO TLS
@ -183,19 +184,22 @@ func submitConcurrentWatch(cx ctlCtx, number int, wgDone *sync.WaitGroup, closeC
return nil
}
wgSchedule.Add(number)
for i := 0; i < number; i++ {
go func(i int) {
defer wgDone.Done()
testutils.ExecuteWithTimeout(cx.t, cx.getTestTimeout(), func() {
wgSchedule.Add(number)
if err := createWatchConnection(); err != nil {
cx.t.Fatalf("testV3CurlMaxStream watch failed: %d, error: %v", i, err)
}
for i := 0; i < number; i++ {
go func(i int) {
defer wgDone.Done()
}(i)
}
// make sure all goroutines have already been scheduled.
wgSchedule.Wait()
if err := createWatchConnection(); err != nil {
cx.t.Fatalf("testV3CurlMaxStream watch failed: %d, error: %v", i, err)
}
}(i)
}
// make sure all goroutines have already been scheduled.
wgSchedule.Wait()
})
}
func submitRangeAfterConcurrentWatch(cx ctlCtx, expectedValue string) {