From 69afcd19609d7026f0d7aa00af632b001d9416bd Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Mon, 3 Apr 2023 21:13:18 +0200 Subject: [PATCH] tests: Fix comparing etcd version Signed-off-by: Marek Siarkowicz --- tests/framework/e2e/etcd_process.go | 10 +++++++++- tests/robustness/linearizability_test.go | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/framework/e2e/etcd_process.go b/tests/framework/e2e/etcd_process.go index 85eef6974..bb595b401 100644 --- a/tests/framework/e2e/etcd_process.go +++ b/tests/framework/e2e/etcd_process.go @@ -364,7 +364,15 @@ func GetVersionFromBinary(binaryPath string) (*semver.Version, error) { for _, line := range lines { if strings.HasPrefix(line, "etcd Version:") { versionString := strings.TrimSpace(strings.SplitAfter(line, ":")[1]) - return semver.NewVersion(versionString) + version, err := semver.NewVersion(versionString) + if err != nil { + return nil, err + } + return &semver.Version{ + Major: version.Major, + Minor: version.Minor, + Patch: version.Patch, + }, nil } } diff --git a/tests/robustness/linearizability_test.go b/tests/robustness/linearizability_test.go index 55e3c5ec0..935a6e120 100644 --- a/tests/robustness/linearizability_test.go +++ b/tests/robustness/linearizability_test.go @@ -147,7 +147,7 @@ func TestRobustness(t *testing.T) { e2e.WithPeerProxy(true), e2e.WithIsPeerTLS(true), } - if !v.LessThan(version.V3_6) { + if v.Compare(version.V3_6) >= 0 { snapshotOptions = append(snapshotOptions, e2e.WithSnapshotCatchUpEntries(100)) } scenarios = append(scenarios, scenario{