From dcc71d6521108ac75236b94d7f456223fbeb88cb Mon Sep 17 00:00:00 2001 From: Nick Santos Date: Tue, 15 Mar 2022 13:46:58 -0400 Subject: [PATCH] integration: wait for resource to become ready before disabling (#5596) --- integration/disable_test.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/integration/disable_test.go b/integration/disable_test.go index dd3b4ecf3b..06c4ebcc3e 100644 --- a/integration/disable_test.go +++ b/integration/disable_test.go @@ -43,13 +43,20 @@ func TestDisableDC(t *testing.T) { ctx, cancel := context.WithTimeout(f.ctx, time.Minute) defer cancel() + f.WaitUntil(ctx, "uiresource available", func() (string, error) { + out, err := f.tilt.Get(ctx, "uiresource") + return string(out), err + }, "disabletest") + + f.runOrFail(f.tilt.cmd(ctx, []string{"wait", "--for=condition=Ready", "uiresource/disabletest"}, nil), "wait") + psArgs := []string{ "ps", "-f", "name=disabletest", "--format", "{{.Image}}", } - f.WaitUntil(ctx, "service up", func() (string, error) { - return f.dockerCmdOutput(psArgs) - }, "disabletest") + out, err := f.dockerCmdOutput(psArgs) + require.NoError(t, err) + require.Contains(t, out, "disabletest") f.WaitUntil(ctx, "disable configmap available", func() (string, error) { out, err := f.tilt.Get(ctx, "configmap")