github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

fix race with the controller in TestDSCUpdatesPodLabelAfterDedupCurHistories

Browse Source
This commit is contained in:
Filip Křepinský 2022-11-11 11:52:56 +01:00
parent 3649eeae9c
commit 1e078f1630
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/daemonset/daemonset_test.go
View File

@ -850,12 +850,13 @@ func TestDSCUpdatesPodLabelAfterDedupCurHistories(t *testing.T) {
t.Fatalf("Failed to update the pod label after new controllerrevision is created: %v", err)
}
err = wait.PollImmediate(1*time.Second, 10*time.Second, func() (bool, error) {
revs, err := clientset.AppsV1().ControllerRevisions(ds.Namespace).List(context.TODO(), metav1.ListOptions{})
if err != nil {
t.Fatalf("Failed to list controllerrevision: %v", err)
return false, fmt.Errorf("failed to list controllerrevision: %v", err)
}
if revs.Size() == 0 {
t.Fatalf("No avaialable controllerrevision")
return false, fmt.Errorf("no avaialable controllerrevision")
}
for _, rev := range revs.Items {
@ -863,11 +864,17 @@ func TestDSCUpdatesPodLabelAfterDedupCurHistories(t *testing.T) {
for _, oref := range rev.OwnerReferences {
if oref.Kind == "DaemonSet" && oref.UID == ds.UID {
if rev.Name != newName {
t.Fatalf("duplicate controllerrevision is not deleted")
t.Logf("waiting for duplicate controllerrevision %v to be deleted", newName)
return false, nil
}
}
}
}
return true, nil
})
if err != nil {
t.Fatalf("Failed to check that duplicate controllerrevision is not deleted: %v", err)
}
}
// TestTaintedNode tests tainted node isn't expected to have pod scheduled