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

fix TestMutatingWebhookResetsInvalidManagedFields flakes

Browse Source
This commit is contained in:
Kevin Wiesmueller 2021-04-22 22:02:44 +02:00
parent 9b7b966508
commit 96a8df455c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/integration/apiserver/admissionwebhook/invalid_managedFields_test.go
View File

@ -125,6 +125,7 @@ func TestMutatingWebhookResetsInvalidManagedFields(t *testing.T) {
// Make sure reset happens on patch requests
// wait until new webhook is called
if err := wait.PollImmediate(time.Millisecond*5, wait.ForeverTestTimeout, func() (bool, error) {
defer recordedWarnings.Reset()
pod, err = client.CoreV1().Pods("default").Patch(context.TODO(), invalidManagedFieldsMarkerFixture.Name, types.JSONPatchType, []byte("[]"), metav1.PatchOptions{})
if err != nil {
return false, err
@ -133,21 +134,20 @@ func TestMutatingWebhookResetsInvalidManagedFields(t *testing.T) {
lastErr = err
return false, nil
}
if warningWriter.WarningCount() != 1 {
lastErr = fmt.Errorf("expected one warning, got: %v", warningWriter.WarningCount())
return false, nil
}
if !strings.Contains(recordedWarnings.String(), expectedWarning) {
lastErr = fmt.Errorf("unexpected warning, expected: \n%v\n, got: \n%v",
expectedWarning, recordedWarnings.String())
return false, nil
}
lastErr = nil
return true, nil
}); err != nil {
}); err != nil || lastErr != nil {
t.Fatalf("failed to wait for apiserver handling webhook mutation: %v, last error: %v", err, lastErr)
}
if lastErr != nil {
t.Fatal(lastErr)
}
if warningWriter.WarningCount() != 1 {
t.Errorf("expected one warning, got: %v", warningWriter.WarningCount())
}
if !strings.Contains(recordedWarnings.String(), expectedWarning) {
t.Errorf("unexpected warning, expected: \n%v\n, got: \n%v",
expectedWarning, recordedWarnings.String())
}
recordedWarnings.Reset()
// Make sure reset happens in update requests
pod, err = client.CoreV1().Pods("default").Update(context.TODO(), pod, metav1.UpdateOptions{})