kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

update pull-local#16756 

Signed-off-by: heartlock <21521209@zju.edu.cn>
This commit is contained in:
heartlock 2015-10-10 09:09:53 +08:00
parent b7083cf08b
commit dc9dd188cf
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
integration-cli/docker_cli_pull_local_test.go
View File

@ -34,9 +34,8 @@ func (s *DockerRegistrySuite) TestPullImageWithAliases(c *check.C) {
dockerCmd(c, "pull", repos[0]) dockerCmd(c, "pull", repos[0])
dockerCmd(c, "inspect", repos[0]) dockerCmd(c, "inspect", repos[0])
for _, repo := range repos[1:] { for _, repo := range repos[1:] {
if _, _, err := dockerCmdWithError("inspect", repo); err == nil { _, _, err := dockerCmdWithError("inspect", repo)
c.Fatalf("Image %v shouldn't have been pulled down", repo) c.Assert(err, check.NotNil, check.Commentf("Image %v shouldn't have been pulled down", repo))
}
} }
} }
@ -54,9 +53,7 @@ func (s *DockerRegistrySuite) TestConcurrentPullWholeRepo(c *check.C) {
ENV BAR bar ENV BAR bar
CMD echo %s CMD echo %s
`, repo), true) `, repo), true)
if err != nil { c.Assert(err, check.IsNil)
c.Fatal(err)
}
dockerCmd(c, "push", repo) dockerCmd(c, "push", repo)
repos = append(repos, repo) repos = append(repos, repo)
} }
@ -87,9 +84,7 @@ func (s *DockerRegistrySuite) TestConcurrentPullWholeRepo(c *check.C) {
for _, repo := range repos { for _, repo := range repos {
dockerCmd(c, "inspect", repo) dockerCmd(c, "inspect", repo)
out, _ := dockerCmd(c, "run", "--rm", repo) out, _ := dockerCmd(c, "run", "--rm", repo)
if strings.TrimSpace(out) != "/bin/sh -c echo "+repo { c.Assert(strings.TrimSpace(out), check.Equals, "/bin/sh -c echo "+repo, check.Commentf("CMD did not contain /bin/sh -c echo %s: %s", repo, out))
c.Fatalf("CMD did not contain /bin/sh -c echo %s: %s", repo, out)
}
} }
} }
@ -112,9 +107,7 @@ func (s *DockerRegistrySuite) TestConcurrentFailingPull(c *check.C) {
// package is not goroutine-safe. // package is not goroutine-safe.
for i := 0; i != numPulls; i++ { for i := 0; i != numPulls; i++ {
err := <-results err := <-results
if err == nil { c.Assert(err, check.NotNil, check.Commentf("expected pull to fail"))
c.Fatal("expected pull to fail")
}
} }
} }
@ -133,9 +126,7 @@ func (s *DockerRegistrySuite) TestConcurrentPullMultipleTags(c *check.C) {
ENV BAR bar ENV BAR bar
CMD echo %s CMD echo %s
`, repo), true) `, repo), true)
if err != nil { c.Assert(err, check.IsNil)
c.Fatal(err)
}
dockerCmd(c, "push", repo) dockerCmd(c, "push", repo)
repos = append(repos, repo) repos = append(repos, repo)
} }
@ -165,8 +156,6 @@ func (s *DockerRegistrySuite) TestConcurrentPullMultipleTags(c *check.C) {
for _, repo := range repos { for _, repo := range repos {
dockerCmd(c, "inspect", repo) dockerCmd(c, "inspect", repo)
out, _ := dockerCmd(c, "run", "--rm", repo) out, _ := dockerCmd(c, "run", "--rm", repo)
if strings.TrimSpace(out) != "/bin/sh -c echo "+repo { c.Assert(strings.TrimSpace(out), check.Equals, "/bin/sh -c echo "+repo, check.Commentf("CMD did not contain /bin/sh -c echo %s; %s", repo, out))
c.Fatalf("CMD did not contain /bin/sh -c echo %s: %s", repo, out)
}
} }
} }