From 775b118a6d2cd9f7bf7ef8fac0dd83fceac862ca Mon Sep 17 00:00:00 2001 From: Jefftree Date: Tue, 11 Mar 2025 21:00:48 +0000 Subject: [PATCH] Remove invalid emulated version and add lexographical order test --- .../controller/leaderelection/election_test.go | 16 ++++++++++++++++ .../coordinated_leader_election_test.go | 3 +-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pkg/controlplane/controller/leaderelection/election_test.go b/pkg/controlplane/controller/leaderelection/election_test.go index c6b08d2c7f7..f055ea4a9fa 100644 --- a/pkg/controlplane/controller/leaderelection/election_test.go +++ b/pkg/controlplane/controller/leaderelection/election_test.go @@ -404,6 +404,22 @@ func TestCompare(t *testing.T) { }, expectedResult: 1, }, + { + name: "lhs less than rhs, lexographical order check", + lhs: &v1alpha2.LeaseCandidate{ + Spec: v1alpha2.LeaseCandidateSpec{ + EmulationVersion: "1.2.0", + BinaryVersion: "1.20.0", + }, + }, + rhs: &v1alpha2.LeaseCandidate{ + Spec: v1alpha2.LeaseCandidateSpec{ + EmulationVersion: "1.19.0", + BinaryVersion: "1.20.0", + }, + }, + expectedResult: -1, + }, } for _, tc := range cases { t.Run(tc.name, func(t *testing.T) { diff --git a/test/integration/apiserver/coordinated_leader_election_test.go b/test/integration/apiserver/coordinated_leader_election_test.go index af992d783b9..01d7837d7fb 100644 --- a/test/integration/apiserver/coordinated_leader_election_test.go +++ b/test/integration/apiserver/coordinated_leader_election_test.go @@ -149,8 +149,7 @@ func TestMultipleLeaseCandidate(t *testing.T) { go cletest.createAndRunFakeController("baz1", "default", "baz", "1.20.0", "1.20.0", tc.preferredStrategy) go cletest.createAndRunFakeController("baz2", "default", "baz", "1.20.0", "1.19.0", tc.preferredStrategy) go cletest.createAndRunFakeController("baz3", "default", "baz", "1.19.0", "1.19.0", tc.preferredStrategy) - go cletest.createAndRunFakeController("baz4", "default", "baz", "1.2.0", "1.19.0", tc.preferredStrategy) - go cletest.createAndRunFakeController("baz5", "default", "baz", "1.20.0", "1.19.0", tc.preferredStrategy) + go cletest.createAndRunFakeController("baz4", "default", "baz", "1.20.0", "1.19.0", tc.preferredStrategy) cletest.pollForLease(ctx, "baz", "default", tc.expectedHolderIdentity) }) }