From 0dfea32250331c9d94d4ba9b246ad04ce1e96484 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Mon, 12 Oct 2020 13:46:41 +0200 Subject: [PATCH] Revert "Temporarily disable some red ACI tests, to be put reverted once the platform is back to green (hopefully in a day or 2)" This reverts commit b10acc1a601e4f4c75d6fefbdc2ea138a687c5ed. Signed-off-by: Guillaume Tardif --- tests/aci-e2e/e2e-aci_test.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/aci-e2e/e2e-aci_test.go b/tests/aci-e2e/e2e-aci_test.go index d6fda9a1..8457a743 100644 --- a/tests/aci-e2e/e2e-aci_test.go +++ b/tests/aci-e2e/e2e-aci_test.go @@ -57,8 +57,7 @@ const ( ) var ( - binDir string - + binDir string location = []string{"eastus2"} ) @@ -279,8 +278,8 @@ func TestRunVolume(t *testing.T) { }) t.Run("exec", func(t *testing.T) { - res := c.RunDockerOrExitError("exec", container, "pwd") - assert.Assert(t, strings.Contains(res.Stdout(), "/")) + res := c.RunDockerCmd("exec", container, "pwd") + res.Assert(t, icmd.Expected{Out: "/"}) res = c.RunDockerOrExitError("exec", container, "echo", "fail_with_argument") res.Assert(t, icmd.Expected{ @@ -693,7 +692,6 @@ func TestUpUpdate(t *testing.T) { }) } -/* func TestRunEnvVars(t *testing.T) { c := NewParallelE2eCLI(t, binDir) _, _, _ = setupTestResourceGroup(t, c) @@ -734,12 +732,11 @@ func TestRunEnvVars(t *testing.T) { if strings.Contains(res.Stdout(), "Giving user user1 access to schema mytestdb") { return poll.Success() } - return poll.Continue("waiting for DB container to be up\n" + res.Stdout()) + return poll.Continue("waiting for DB container to be up") } poll.WaitOn(t, check, poll.WithDelay(5*time.Second), poll.WithTimeout(60*time.Second)) }) } -*/ func setupTestResourceGroup(t *testing.T, c *E2eCLI) (string, string, string) { startTime := strconv.Itoa(int(time.Now().Unix()))