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

Merge pull request #1429 from gtardif/fix_flaky_restart_test

Browse Source 
Fix log expectation with random exec order
This commit is contained in:
Guillaume Tardif 2021-03-15 11:32:57 +01:00 committed by GitHub
commit c2195b5cca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
local/e2e/compose/compose_test.go
View File

@ -20,6 +20,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"os" "os"
"regexp"
"strings" "strings"
"testing" "testing"
"time" "time"
@ -139,10 +140,9 @@ func TestAttachRestart(t *testing.T) {
res := c.RunDockerOrExitError("compose", "--ansi=never", "--project-directory", "fixtures/attach-restart", "up") res := c.RunDockerOrExitError("compose", "--ansi=never", "--project-directory", "fixtures/attach-restart", "up")
output := res.Stdout() output := res.Stdout()
assert.Assert(t, strings.Contains(output, `another_1 | world exitRegex := regexp.MustCompile("attach-restart_another_1 exited with code 1")
attach-restart_another_1 exited with code 1 assert.Equal(t, len(exitRegex.FindAllStringIndex(output, -1)), 3, res.Combined())
another_1 | world
attach-restart_another_1 exited with code 1 execRegex := regexp.MustCompile(`another_1 \| world`)
another_1 | world assert.Equal(t, len(execRegex.FindAllStringIndex(output, -1)), 3, res.Combined())
attach-restart_another_1 exited with code 1`), res.Combined())
} }