Merge pull request #19032 from ahrtr/memberadd_test_20241209

Update TestMemberAdd's context timeout by adding 5 more seconds
etcd-io · Dec 9, 2024 · 854bdd6 · 854bdd6
2 parents 801dfc3 + 99be181
commit 854bdd6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/tests/common/member_test.go b/tests/common/member_test.go
@@ -113,7 +113,11 @@ func TestMemberAdd(t *testing.T) {
 		for _, quorumTc := range quorumTcs {
 			for _, clusterTc := range clusterTestCases() {
 				t.Run(learnerTc.name+"/"+quorumTc.name+"/"+clusterTc.name, func(t *testing.T) {
-					ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+					ctxTimeout := 10 * time.Second
+					if quorumTc.waitForQuorum {
+						ctxTimeout += etcdserver.HealthInterval
+					}
+					ctx, cancel := context.WithTimeout(context.Background(), ctxTimeout)
 					defer cancel()
 					c := clusterTc.config
 					c.StrictReconfigCheck = quorumTc.strictReconfigCheck