tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 08:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Temporarily disable some red ACI tests, to be put reverted once the platform is back to green (hopefully in a day or 2)"

Browse Source 
This reverts commit b10acc1a601e4f4c75d6fefbdc2ea138a687c5ed.

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-10-12 13:46:41 +02:00
parent a067882b6d
commit 0dfea32250
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/aci-e2e/e2e-aci_test.go
View File

@ -58,7 +58,6 @@ const (
var ( var (
binDir string binDir string
location = []string{"eastus2"} location = []string{"eastus2"}
) )
@ -279,8 +278,8 @@ func TestRunVolume(t *testing.T) {
}) })
t.Run("exec", func(t *testing.T) { t.Run("exec", func(t *testing.T) {
res := c.RunDockerOrExitError("exec", container, "pwd") res := c.RunDockerCmd("exec", container, "pwd")
assert.Assert(t, strings.Contains(res.Stdout(), "/")) res.Assert(t, icmd.Expected{Out: "/"})
res = c.RunDockerOrExitError("exec", container, "echo", "fail_with_argument") res = c.RunDockerOrExitError("exec", container, "echo", "fail_with_argument")
res.Assert(t, icmd.Expected{ res.Assert(t, icmd.Expected{
@ -693,7 +692,6 @@ func TestUpUpdate(t *testing.T) {
}) })
} }
/*
func TestRunEnvVars(t *testing.T) { func TestRunEnvVars(t *testing.T) {
c := NewParallelE2eCLI(t, binDir) c := NewParallelE2eCLI(t, binDir)
_, _, _ = setupTestResourceGroup(t, c) _, _, _ = setupTestResourceGroup(t, c)
@ -734,12 +732,11 @@ func TestRunEnvVars(t *testing.T) {
if strings.Contains(res.Stdout(), "Giving user user1 access to schema mytestdb") { if strings.Contains(res.Stdout(), "Giving user user1 access to schema mytestdb") {
return poll.Success() 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)) poll.WaitOn(t, check, poll.WithDelay(5*time.Second), poll.WithTimeout(60*time.Second))
}) })
} }
*/
func setupTestResourceGroup(t *testing.T, c *E2eCLI) (string, string, string) { func setupTestResourceGroup(t *testing.T, c *E2eCLI) (string, string, string) {
startTime := strconv.Itoa(int(time.Now().Unix())) startTime := strconv.Itoa(int(time.Now().Unix()))