Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix TestV2DeprecationSnapshotMatches, maybe ignore the first snapshot file of etcd v3.6

Browse Source 
Signed-off-by: Clement <gh.2lgqz@aleeas.com>
This commit is contained in:
Clement 2024-09-13 17:11:27 +08:00
parent 7efb9b9fe4
commit efd3ec6fa4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/e2e/v2store_deprecation_test.go
View File

@ -251,6 +251,9 @@ func assertSnapshotsMatch(t testing.TB, oldMemberDataDir, newMemberDataDir strin
assert.NotEmpty(t, oldMemberSnapshots) assert.NotEmpty(t, oldMemberSnapshots)
assert.NotEmpty(t, newMemberSnapshots) assert.NotEmpty(t, newMemberSnapshots)
sort.Strings(oldMemberSnapshots)
sort.Strings(newMemberSnapshots)
currVer, err := e2e.GetVersionFromBinary(e2e.BinPath.Etcd) currVer, err := e2e.GetVersionFromBinary(e2e.BinPath.Etcd)
if err != nil { if err != nil {
t.Fatal(err) 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. // 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. // 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) { if (version.V3_6.Equal(*currVer) || version.V3_6.LessThan(*currVer)) && len(oldMemberSnapshots) < len(newMemberSnapshots) {
// Remove the extra snapshot file
newMemberSnapshots = newMemberSnapshots[1:] newMemberSnapshots = newMemberSnapshots[1:]
} }
assert.Equal(t, len(oldMemberSnapshots), len(newMemberSnapshots)) assert.Equal(t, len(oldMemberSnapshots), len(newMemberSnapshots))
sort.Strings(oldMemberSnapshots)
sort.Strings(newMemberSnapshots)
for i := 0; i < len(oldMemberSnapshots); i++ { for i := 0; i < len(oldMemberSnapshots); i++ {
firstSnapshot, err := snap.Read(lg, oldMemberSnapshots[i]) firstSnapshot, err := snap.Read(lg, oldMemberSnapshots[i])
if err != nil { if err != nil {