tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #531 from docker/ecs_flaky_test 

Fix flakiness in ECS E2E
This commit is contained in:
Guillaume Tardif 2020-08-21 12:42:25 +02:00 committed by GitHub
parent ffc6581f35 73f5f030ac
commit 5a36fb9f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/ecs-e2e/e2e-ecs_test.go
View File

@ -27,9 +27,11 @@ import (
"time"
"gotest.tools/v3/assert"
"gotest.tools/v3/poll"
"gotest.tools/v3/icmd"
. "github.com/docker/api/tests/framework"
"gotest.tools/v3/icmd"
)
var binDir string
@ -99,12 +101,20 @@ func TestCompose(t *testing.T) {
})
t.Run("nginx GET", func(t *testing.T) {
r, err := http.Get(url)
assert.NilError(t, err)
assert.Equal(t, r.StatusCode, http.StatusOK)
b, err := ioutil.ReadAll(r.Body)
assert.NilError(t, err)
assert.Assert(t, strings.Contains(string(b), "Welcome to nginx!"))
checkUp := func(t poll.LogT) poll.Result {
r, err := http.Get(url)
if err != nil {
return poll.Continue("Err while getting %s : %v", url, err)
} else if r.StatusCode != http.StatusOK {
return poll.Continue("status %s while getting %s", r.Status, url)
}
b, err := ioutil.ReadAll(r.Body)
if err == nil && strings.Contains(string(b), "Welcome to nginx!") {
return poll.Success()
}
return poll.Error(fmt.Errorf("No nginx welcome page received at %s: \n%s", url, string(b)))
}
poll.WaitOn(t, checkUp, poll.WithDelay(2*time.Second), poll.WithTimeout(60*time.Second))
})
t.Run("compose down", func(t *testing.T) {