toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3145 from vieux/fix_docker_images

Browse Source 
multiple fixed in docker images
Upstream-commit: 5b33ae5971ae1071ba377ec1761956a05bf7b21e
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-12-12 11:17:19 -08:00
parent e69094c61d 4ef02ca4a1
commit 8ac6f87f86
2 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration/commands_test.go
+2 -2
View File
@@ -867,11 +867,11 @@ func TestImagesTree(t *testing.T) {
}
cmdOutput := string(cmdOutputBytes)
regexpStrings := []string{
fmt.Sprintf("└─%s Size: (\\d+.\\d+ MB) \\(virtual \\d+.\\d+ MB\\) Tags: %s:latest", unitTestImageIDShort, unitTestImageName),
fmt.Sprintf("└─%s Virtual Size: \\d+.\\d+ MB Tags: %s:latest", unitTestImageIDShort, unitTestImageName),
"(?m) └─[0-9a-f]+.*",
"(?m) └─[0-9a-f]+.*",
"(?m) └─[0-9a-f]+.*",
fmt.Sprintf("(?m)^ └─%s Size: \\d+ B \\(virtual \\d+.\\d+ MB\\) Tags: test:latest", utils.TruncateID(image.ID)),
fmt.Sprintf("(?m)^ └─%s Virtual Size: \\d+.\\d+ MB Tags: test:latest", utils.TruncateID(image.ID)),
}
compiledRegexps := []*regexp.Regexp{}