From e98a790ce92f545b0e7370b1b73a9f50f8f79f46 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Tue, 5 Jan 2021 17:02:54 +0100 Subject: [PATCH] Fix ECS flaky test and add bettre debug info in assertions Signed-off-by: Guillaume Tardif --- tests/ecs-e2e/e2e-ecs_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/ecs-e2e/e2e-ecs_test.go b/tests/ecs-e2e/e2e-ecs_test.go index 9a8e8880a..979c9f71b 100644 --- a/tests/ecs-e2e/e2e-ecs_test.go +++ b/tests/ecs-e2e/e2e-ecs_test.go @@ -57,23 +57,27 @@ func TestSecrets(t *testing.T) { err := ioutil.WriteFile(secretFile, []byte("pass1"), 0644) assert.Check(t, err == nil) res := cmd.RunDockerCmd("secret", "create", secretName, secretFile) - assert.Check(t, strings.Contains(res.Stdout(), secretName)) + assert.Check(t, strings.Contains(res.Stdout(), secretName), res.Stdout()) }) t.Run("list secrets", func(t *testing.T) { res := cmd.RunDockerCmd("secret", "list") - assert.Check(t, strings.Contains(res.Stdout(), secretName)) + if !strings.Contains(res.Stdout(), secretName) { // test sometimes fail, it seems things might need a bit of time on the AWS side, trying once morez + time.Sleep(1 * time.Second) + res = cmd.RunDockerCmd("secret", "list") + } + assert.Check(t, strings.Contains(res.Stdout(), secretName), res.Stdout()) }) t.Run("inspect secret", func(t *testing.T) { res := cmd.RunDockerCmd("secret", "inspect", secretName) - assert.Check(t, strings.Contains(res.Stdout(), `"Name": "`+secretName+`"`)) + assert.Check(t, strings.Contains(res.Stdout(), `"Name": "`+secretName+`"`), res.Stdout()) }) t.Run("rm secret", func(t *testing.T) { cmd.RunDockerCmd("secret", "rm", secretName) res := cmd.RunDockerCmd("secret", "list") - assert.Check(t, !strings.Contains(res.Stdout(), secretName)) + assert.Check(t, !strings.Contains(res.Stdout(), secretName), res.Stdout()) }) }