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

Improve test that was sometimes passing too quickly where it should fail

This commit is contained in:
Guillaume Tardif 2020-08-05 13:59:03 +02:00
parent d1b8bcb2c7
commit 4dd1918ac2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/skip-win-ci-e2e/skip_win_ci_test.go
View File

@ -24,6 +24,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/docker/api/cli/mobycli"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
@ -50,9 +52,10 @@ RUN sleep 100`), 0644)).To(Succeed())
_, err := ctx.Exec() _, err := ctx.Exec()
errs <- err errs <- err
}() }()
mobyBuild := mobycli.ComDockerCli + " build --no-cache -t " + imageName
err := WaitFor(time.Second, 10*time.Second, errs, func() bool { err := WaitFor(time.Second, 10*time.Second, errs, func() bool {
out := s.ListProcessesCommand().ExecOrDie() out := s.ListProcessesCommand().ExecOrDie()
return strings.Contains(out, imageName) return strings.Contains(out, mobyBuild)
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
log.Println("Killing docker process") log.Println("Killing docker process")
@ -60,7 +63,7 @@ RUN sleep 100`), 0644)).To(Succeed())
close(shutdown) close(shutdown)
err = WaitFor(time.Second, 12*time.Second, nil, func() bool { err = WaitFor(time.Second, 12*time.Second, nil, func() bool {
out := s.ListProcessesCommand().ExecOrDie() out := s.ListProcessesCommand().ExecOrDie()
return !strings.Contains(out, imageName) return !strings.Contains(out, mobyBuild)
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })