Skip to content

Commit edf468c

Browse files
committed
Attempt to fix timeout flake
Signed-off-by: Chun-Hung Tseng <henrytseng@google.com>
1 parent a998bec commit edf468c

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

tests/e2e/cluster_downgrade_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,18 @@ func testDowngradeUpgrade(t *testing.T, numberOfMembersToDowngrade int, clusterS
190190
assert.Equal(t, beforeKV.Kvs, afterKV.Kvs)
191191
assert.Equal(t, beforeMembers.Members, afterMembers.Members)
192192

193-
if len(epc.Procs) > 1 {
194-
t.Log("Waiting health interval to required to make membership changes")
195-
time.Sleep(etcdserver.HealthInterval)
196-
}
197-
198193
if triggerCancellation == cancelAfterDowngrading {
194+
time.Sleep(1 * time.Second)
199195
e2e.DowngradeCancel(t, epc)
200196
t.Log("Downgrade cancelled, validating if cluster is in the right state")
201197
e2e.ValidateMemberVersions(t, epc, generatePartialCancellationVersions(clusterSize, membersToChange, lastClusterVersion))
202198
}
203199

200+
if len(epc.Procs) > 1 {
201+
t.Log("Waiting health interval to required to make membership changes")
202+
time.Sleep(etcdserver.HealthInterval)
203+
}
204+
204205
t.Log("Adding learner to test membership, but avoid breaking quorum")
205206
resp, err = cc.MemberAddAsLearner(context.Background(), "fake2", []string{"http://127.0.0.1:1002"})
206207
require.NoError(t, err)

0 commit comments

Comments
 (0)