From efd3ec6fa424708e8a552d42eaf6af39f5907ef0 Mon Sep 17 00:00:00 2001 From: Clement Date: Fri, 13 Sep 2024 17:11:27 +0800 Subject: [PATCH] tests: fix TestV2DeprecationSnapshotMatches, maybe ignore the first snapshot file of etcd v3.6 Signed-off-by: Clement --- tests/e2e/v2store_deprecation_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/e2e/v2store_deprecation_test.go b/tests/e2e/v2store_deprecation_test.go index 764c57954..f3e3be414 100644 --- a/tests/e2e/v2store_deprecation_test.go +++ b/tests/e2e/v2store_deprecation_test.go @@ -251,6 +251,9 @@ func assertSnapshotsMatch(t testing.TB, oldMemberDataDir, newMemberDataDir strin assert.NotEmpty(t, oldMemberSnapshots) assert.NotEmpty(t, newMemberSnapshots) + sort.Strings(oldMemberSnapshots) + sort.Strings(newMemberSnapshots) + currVer, err := e2e.GetVersionFromBinary(e2e.BinPath.Etcd) if err != nil { t.Fatal(err) @@ -259,12 +262,11 @@ func assertSnapshotsMatch(t testing.TB, oldMemberDataDir, newMemberDataDir strin // Starting from v3.6, etcd might create an extra snapshot file (appliedIndex == 1) on server startup. // Except for this, other snapshot files should be the same as in old versions. if (version.V3_6.Equal(*currVer) || version.V3_6.LessThan(*currVer)) && len(oldMemberSnapshots) < len(newMemberSnapshots) { + // Remove the extra snapshot file newMemberSnapshots = newMemberSnapshots[1:] } assert.Equal(t, len(oldMemberSnapshots), len(newMemberSnapshots)) - sort.Strings(oldMemberSnapshots) - sort.Strings(newMemberSnapshots) for i := 0; i < len(oldMemberSnapshots); i++ { firstSnapshot, err := snap.Read(lg, oldMemberSnapshots[i]) if err != nil {