mirror of https://github.com/docker/compose.git
Merge pull request #762 from docker/revert_atlas_disabled_tests
Revert "Temporarily disable some red ACI tests, to be put reverted on…
This commit is contained in:
commit
8e9c2e5092
|
@ -57,8 +57,7 @@ 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()))
|
||||||
|
|
Loading…
Reference in New Issue