djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1695 from vmware-tanzu/fix_pod_shutdown_test_flake

Browse Source 
fix flake seen in pod_shutdown_test.go
This commit is contained in:
Ryan Richard 2023-09-27 07:23:45 -07:00 committed by GitHub
commit 24069b56dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/integration/pod_shutdown_test.go
View File

@ -120,7 +120,7 @@ func testShutdownAllPodsOfApp(t *testing.T, env *testlib.TestEnv, namespace stri
// The leader election lease should already contain the empty string as the holder, because the old leader // The leader election lease should already contain the empty string as the holder, because the old leader
// pod should have given up the lease during its graceful shutdown. // pod should have given up the lease during its graceful shutdown.
waitForLeaderElectionLeaseToHaveHolderIdentity(t, namespace, appName, waitForLeaderElectionLeaseToHaveHolderIdentity(t, namespace, appName,
func(holder string) bool { return holder == "" }, 200*time.Millisecond) func(holder string) bool { return holder == "" }, 1*time.Minute)
} }
// Given a list of pods, return a list of their names. // Given a list of pods, return a list of their names.
@ -220,13 +220,14 @@ func waitForLeaderElectionLeaseToHaveHolderIdentity(
waitDuration time.Duration, waitDuration time.Duration,
) { ) {
t.Helper() t.Helper()
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute) ctx, cancel := context.WithTimeout(context.Background(), waitDuration*2)
defer cancel() defer cancel()
client := testlib.NewKubernetesClientset(t) client := testlib.NewKubernetesClientset(t)
testlib.RequireEventually(t, func(requireEventually *require.Assertions) { testlib.RequireEventually(t, func(requireEventually *require.Assertions) {
lease, err := client.CoordinationV1().Leases(namespace).Get(ctx, leaseName, metav1.GetOptions{}) lease, err := client.CoordinationV1().Leases(namespace).Get(ctx, leaseName, metav1.GetOptions{})
requireEventually.NoError(err) requireEventually.NoError(err)
requireEventually.True(holderIdentityPredicate(*lease.Spec.HolderIdentity)) requireEventually.Truef(holderIdentityPredicate(*lease.Spec.HolderIdentity),
"leader election lease had holder %s", *lease.Spec.HolderIdentity)
}, waitDuration, 200*time.Millisecond) }, waitDuration, 200*time.Millisecond)
} }