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

Merge pull request #308 from docker/test-stream-logs

Browse Source 
Make log stream test more readable
This commit is contained in:
Djordje Lukic 2020-06-30 18:32:46 +02:00 committed by GitHub
commit fc4e0f6216
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,9 @@ func (s *E2eACISuite) TestACIBackend() {
}) })
s.T().Run("follow logs from nginx", func(t *testing.T) { s.T().Run("follow logs from nginx", func(t *testing.T) {
ctx := s.NewDockerCommand("logs", "--follow", testContainerName).WithTimeout(time.NewTimer(5 * time.Second).C) timeChan := make(chan time.Time)
ctx := s.NewDockerCommand("logs", "--follow", testContainerName).WithTimeout(timeChan)
outChan := make(chan string) outChan := make(chan string)
go func() { go func() {
@ -159,10 +161,11 @@ func (s *E2eACISuite) TestACIBackend() {
outChan <- output outChan <- output
}() }()
// Give the `logs --follow` a little time to get the first burst of logs
time.Sleep(1 * time.Second)
s.NewCommand("curl", nginxExposedURL+"/test").ExecOrDie() s.NewCommand("curl", nginxExposedURL+"/test").ExecOrDie()
// Give the `logs --follow` a little time to get logs of the curl call
time.Sleep(10 * time.Second)
// Trigger a timeout to make ctx.Exec exit
timeChan <- time.Now()
output := <-outChan output := <-outChan