From 5d1225549755832468972e4491991014441946f7 Mon Sep 17 00:00:00 2001 From: Austin Abro Date: Mon, 17 Feb 2025 14:53:34 +0000 Subject: [PATCH] wait for delete Signed-off-by: Austin Abro --- pkg/action/uninstall_test.go | 2 +- pkg/kube/fake/fake.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/action/uninstall_test.go b/pkg/action/uninstall_test.go index 1c67cab7f..5d2b33bdf 100644 --- a/pkg/action/uninstall_test.go +++ b/pkg/action/uninstall_test.go @@ -100,7 +100,7 @@ func TestUninstallRelease_Wait(t *testing.T) { }` unAction.cfg.Releases.Create(rel) failer := unAction.cfg.KubeClient.(*kubefake.FailingKubeClient) - failer.WaitError = fmt.Errorf("U timed out") + failer.WaitForDeleteError = fmt.Errorf("U timed out") unAction.cfg.KubeClient = failer res, err := unAction.Run(rel.Name) is.Error(err) diff --git a/pkg/kube/fake/fake.go b/pkg/kube/fake/fake.go index d722320f8..087fa89cb 100644 --- a/pkg/kube/fake/fake.go +++ b/pkg/kube/fake/fake.go @@ -36,6 +36,7 @@ type FailingKubeClient struct { CreateError error GetError error WaitError error + WaitForDeleteError error DeleteError error DeleteWithPropagationError error WatchUntilReadyError error @@ -82,8 +83,8 @@ func (f *FailingKubeClient) WaitWithJobs(resources kube.ResourceList, d time.Dur // WaitForDelete returns the configured error if set or prints func (f *FailingKubeClient) WaitForDelete(resources kube.ResourceList, d time.Duration) error { - if f.WaitError != nil { - return f.WaitError + if f.WaitForDeleteError != nil { + return f.WaitForDeleteError } return f.PrintingKubeClient.WaitForDelete(resources, d) }