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

Fix text not matching the actual tests

Browse source 
Also fixes a typo in image name.

Fixes #16648

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2015-09-29 15:26:04 +02:00
parent d6e7350b96
commit 8781367c77
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
integration-cli/docker_cli_pull_trusted_test.go
View file

@ -22,7 +22,7 @@ func (s *DockerTrustSuite) TestTrustedPull(c *check.C) {
}
if !strings.Contains(string(out), "Tagging") {
c.Fatalf("Missing expected output on trusted push:\n%s", out)
c.Fatalf("Missing expected output on trusted pull:\n%s", out)
}
dockerCmd(c, "rmi", repoName)
@ -41,7 +41,7 @@ func (s *DockerTrustSuite) TestTrustedPull(c *check.C) {
}
func (s *DockerTrustSuite) TestTrustedIsolatedPull(c *check.C) {
repoName := s.setupTrustedImage(c, "trusted-isolatd-pull")
repoName := s.setupTrustedImage(c, "trusted-isolated-pull")
// Try pull (run from isolated directory without trust information)
pullCmd := exec.Command(dockerBinary, "--config", "/tmp/docker-isolated", "pull", repoName)
@ -52,7 +52,7 @@ func (s *DockerTrustSuite) TestTrustedIsolatedPull(c *check.C) {
}
if !strings.Contains(string(out), "Tagging") {
c.Fatalf("Missing expected output on trusted push:\n%s", out)
c.Fatalf("Missing expected output on trusted pull:\n%s", out)
}
dockerCmd(c, "rmi", repoName)
@ -145,7 +145,7 @@ func (s *DockerTrustSuite) TestTrustedPullFromBadTrustServer(c *check.C) {
}
if !strings.Contains(string(out), "Tagging") {
c.Fatalf("Missing expected output on trusted push:\n%s", out)
c.Fatalf("Missing expected output on trusted pull:\n%s", out)
}
dockerCmd(c, "rmi", repoName)
@ -181,7 +181,7 @@ func (s *DockerTrustSuite) TestTrustedPullFromBadTrustServer(c *check.C) {
}
if !strings.Contains(string(out), "failed to validate data with current trusted certificates") {
c.Fatalf("Missing expected output on trusted push:\n%s", out)
c.Fatalf("Missing expected output on trusted pull:\n%s", out)
}
}
@ -208,7 +208,6 @@ func (s *DockerTrustSuite) TestTrustedPullWithExpiredSnapshot(c *check.C) {
// Snapshots last for three years. This should be expired
fourYearsLater := time.Now().Add(time.Hour * 24 * 365 * 4)
// Should succeed because the server transparently re-signs one
runAtDifferentDate(fourYearsLater, func() {
// Try pull
pullCmd := exec.Command(dockerBinary, "pull", repoName)
@ -247,7 +246,7 @@ func (s *DockerTrustSuite) TestTrustedOfflinePull(c *check.C) {
}
if !strings.Contains(string(out), "Tagging") {
c.Fatalf("Missing expected output on trusted push:\n%s", out)
c.Fatalf("Missing expected output on trusted pull:\n%s", out)
}
dockerCmd(c, "rmi", repoName)
@ -261,6 +260,6 @@ func (s *DockerTrustSuite) TestTrustedOfflinePull(c *check.C) {
}
if !strings.Contains(string(out), "Tagging") {
c.Fatalf("Missing expected output on trusted push:\n%s", out)
c.Fatalf("Missing expected output on trusted pull:\n%s", out)
}
}