0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed TestDiffEnsureDockerinitFilesAreIgnored is too long #12672

Browse source 
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at>
This commit is contained in:
Daniel Antlinger 2015-04-23 16:35:13 -07:00
parent 531ec3cac9
commit 50868b2c57
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration-cli/docker_cli_diff_test.go
View file

@ -40,12 +40,14 @@ func (s *DockerSuite) TestDiffFilenameShownInOutput(c *check.C) {
func (s *DockerSuite) TestDiffEnsureDockerinitFilesAreIgnored(c *check.C) { func (s *DockerSuite) TestDiffEnsureDockerinitFilesAreIgnored(c *check.C) {
// this is a list of files which shouldn't show up in `docker diff` // this is a list of files which shouldn't show up in `docker diff`
dockerinitFiles := []string{"/etc/resolv.conf", "/etc/hostname", "/etc/hosts", "/.dockerinit", "/.dockerenv"} dockerinitFiles := []string{"/etc/resolv.conf", "/etc/hostname", "/etc/hosts", "/.dockerinit", "/.dockerenv"}
containerCount := 5
// we might not run into this problem from the first run, so start a few containers // we might not run into this problem from the first run, so start a few containers
for i := 0; i < 20; i++ { for i := 0; i < containerCount; i++ {
containerCmd := `echo foo > /root/bar` containerCmd := `echo foo > /root/bar`
runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "sh", "-c", containerCmd) runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "sh", "-c", containerCmd)
out, _, err := runCommandWithOutput(runCmd) out, _, err := runCommandWithOutput(runCmd)
if err != nil { if err != nil {
c.Fatal(out, err) c.Fatal(out, err)
} }