From 1a1d1dfe2e2335ffcd1280e2b1064278fef9b625 Mon Sep 17 00:00:00 2001 From: Justin Taylor-Barrick <46463088+jbarrick-mesosphere@users.noreply.github.com> Date: Wed, 11 Dec 2019 14:29:28 -0800 Subject: [PATCH 1/2] Wait for the entire assert timeout for resources to be deleted. Previously, the test timeout was ignored when waiting for resources deleted by a TestStep to disappear. This changes it so that the test assert timeout is respected and used. --- pkg/test/step.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/test/step.go b/pkg/test/step.go index 3c446c023..6701c4ff9 100644 --- a/pkg/test/step.go +++ b/pkg/test/step.go @@ -139,7 +139,7 @@ func (s *Step) DeleteExisting(namespace string) error { } // Wait for resources to be deleted. - return wait.PollImmediate(100*time.Millisecond, 10*time.Second, func() (done bool, err error) { + return wait.PollImmediate(100*time.Millisecond, s.GetTimeout()*time.Second, func() (done bool, err error) { for _, obj := range toDelete { err = cl.Get(context.TODO(), testutils.ObjectKey(obj), obj.DeepCopyObject()) if err == nil || !k8serrors.IsNotFound(err) { From 21b79c45fb8927288d480710cc6c56a7af9e2c40 Mon Sep 17 00:00:00 2001 From: Justin Taylor-Barrick <46463088+jbarrick-mesosphere@users.noreply.github.com> Date: Wed, 11 Dec 2019 14:36:13 -0800 Subject: [PATCH 2/2] cast int to time.Duration --- pkg/test/step.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/test/step.go b/pkg/test/step.go index 6701c4ff9..9f2e759f1 100644 --- a/pkg/test/step.go +++ b/pkg/test/step.go @@ -139,7 +139,7 @@ func (s *Step) DeleteExisting(namespace string) error { } // Wait for resources to be deleted. - return wait.PollImmediate(100*time.Millisecond, s.GetTimeout()*time.Second, func() (done bool, err error) { + return wait.PollImmediate(100*time.Millisecond, time.Duration(s.GetTimeout())*time.Second, func() (done bool, err error) { for _, obj := range toDelete { err = cl.Get(context.TODO(), testutils.ObjectKey(obj), obj.DeepCopyObject()) if err == nil || !k8serrors.IsNotFound(err) {