kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

integ-cli: fix bug and race in TestBuildSpaces

Browse source 
`TestBuildSpaces` is used to do string manipulation to redact timestamps
from compared cmd output. However it was assuming there is going to be
only one `time=".."` in the output --not the case on windows. Therefore
I wrote a regexp to redact all log timestamps.

Also the test used to have a copy/paste bug (see err1/err2). This fixes
that, too.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
This commit is contained in:
Ahmet Alp Balkan 2015-03-21 19:43:14 +00:00
parent e3e6f8e859
commit 28a34dfffd
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
integration-cli/docker_cli_build_test.go
View file

@ -5124,9 +5124,13 @@ func TestBuildSpaces(t *testing.T) {
t.Fatal("Build 2 was supposed to fail, but didn't") t.Fatal("Build 2 was supposed to fail, but didn't")
} }
removeLogTimestamps := func(s string) string {
return regexp.MustCompile(`time="(.*?)"`).ReplaceAllString(s, `time=[TIMESTAMP]`)
}
// Skip over the times // Skip over the times
e1 := err1.Error()[strings.Index(err1.Error(), `level=`):] e1 := removeLogTimestamps(err1.Error())
e2 := err2.Error()[strings.Index(err1.Error(), `level=`):] e2 := removeLogTimestamps(err2.Error())
// Ignore whitespace since that's what were verifying doesn't change stuff // Ignore whitespace since that's what were verifying doesn't change stuff
if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) { if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) {
@ -5139,8 +5143,8 @@ func TestBuildSpaces(t *testing.T) {
} }
// Skip over the times // Skip over the times
e1 = err1.Error()[strings.Index(err1.Error(), `level=`):] e1 = removeLogTimestamps(err1.Error())
e2 = err2.Error()[strings.Index(err1.Error(), `level=`):] e2 = removeLogTimestamps(err2.Error())
// Ignore whitespace since that's what were verifying doesn't change stuff // Ignore whitespace since that's what were verifying doesn't change stuff
if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) { if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) {
@ -5153,8 +5157,8 @@ func TestBuildSpaces(t *testing.T) {
} }
// Skip over the times // Skip over the times
e1 = err1.Error()[strings.Index(err1.Error(), `level=`):] e1 = removeLogTimestamps(err1.Error())
e2 = err2.Error()[strings.Index(err1.Error(), `level=`):] e2 = removeLogTimestamps(err2.Error())
// Ignore whitespace since that's what were verifying doesn't change stuff // Ignore whitespace since that's what were verifying doesn't change stuff
if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) { if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) {