Browse code
Fix text not matching the actual tests
Also fixes a typo in image name.
Fixes #16648
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Miloslav Trmač authored on 2015/09/29 22:26:04Showing 1 changed files
| ... | ... |
@@ -22,7 +22,7 @@ func (s *DockerTrustSuite) TestTrustedPull(c *check.C) {
|
| 22 | 22 |
} |
| 23 | 23 |
|
| 24 | 24 |
if !strings.Contains(string(out), "Tagging") {
|
| 25 |
- c.Fatalf("Missing expected output on trusted push:\n%s", out)
|
|
| 25 |
+ c.Fatalf("Missing expected output on trusted pull:\n%s", out)
|
|
| 26 | 26 |
} |
| 27 | 27 |
|
| 28 | 28 |
dockerCmd(c, "rmi", repoName) |
| ... | ... |
@@ -41,7 +41,7 @@ func (s *DockerTrustSuite) TestTrustedPull(c *check.C) {
|
| 41 | 41 |
} |
| 42 | 42 |
|
| 43 | 43 |
func (s *DockerTrustSuite) TestTrustedIsolatedPull(c *check.C) {
|
| 44 |
- repoName := s.setupTrustedImage(c, "trusted-isolatd-pull") |
|
| 44 |
+ repoName := s.setupTrustedImage(c, "trusted-isolated-pull") |
|
| 45 | 45 |
|
| 46 | 46 |
// Try pull (run from isolated directory without trust information) |
| 47 | 47 |
pullCmd := exec.Command(dockerBinary, "--config", "/tmp/docker-isolated", "pull", repoName) |
| ... | ... |
@@ -52,7 +52,7 @@ func (s *DockerTrustSuite) TestTrustedIsolatedPull(c *check.C) {
|
| 52 | 52 |
} |
| 53 | 53 |
|
| 54 | 54 |
if !strings.Contains(string(out), "Tagging") {
|
| 55 |
- c.Fatalf("Missing expected output on trusted push:\n%s", out)
|
|
| 55 |
+ c.Fatalf("Missing expected output on trusted pull:\n%s", out)
|
|
| 56 | 56 |
} |
| 57 | 57 |
|
| 58 | 58 |
dockerCmd(c, "rmi", repoName) |
| ... | ... |
@@ -145,7 +145,7 @@ func (s *DockerTrustSuite) TestTrustedPullFromBadTrustServer(c *check.C) {
|
| 145 | 145 |
} |
| 146 | 146 |
|
| 147 | 147 |
if !strings.Contains(string(out), "Tagging") {
|
| 148 |
- c.Fatalf("Missing expected output on trusted push:\n%s", out)
|
|
| 148 |
+ c.Fatalf("Missing expected output on trusted pull:\n%s", out)
|
|
| 149 | 149 |
} |
| 150 | 150 |
|
| 151 | 151 |
dockerCmd(c, "rmi", repoName) |
| ... | ... |
@@ -181,7 +181,7 @@ func (s *DockerTrustSuite) TestTrustedPullFromBadTrustServer(c *check.C) {
|
| 181 | 181 |
} |
| 182 | 182 |
|
| 183 | 183 |
if !strings.Contains(string(out), "failed to validate data with current trusted certificates") {
|
| 184 |
- c.Fatalf("Missing expected output on trusted push:\n%s", out)
|
|
| 184 |
+ c.Fatalf("Missing expected output on trusted pull:\n%s", out)
|
|
| 185 | 185 |
} |
| 186 | 186 |
} |
| 187 | 187 |
|
| ... | ... |
@@ -208,7 +208,6 @@ func (s *DockerTrustSuite) TestTrustedPullWithExpiredSnapshot(c *check.C) {
|
| 208 | 208 |
// Snapshots last for three years. This should be expired |
| 209 | 209 |
fourYearsLater := time.Now().Add(time.Hour * 24 * 365 * 4) |
| 210 | 210 |
|
| 211 |
- // Should succeed because the server transparently re-signs one |
|
| 212 | 211 |
runAtDifferentDate(fourYearsLater, func() {
|
| 213 | 212 |
// Try pull |
| 214 | 213 |
pullCmd := exec.Command(dockerBinary, "pull", repoName) |
| ... | ... |
@@ -247,7 +246,7 @@ func (s *DockerTrustSuite) TestTrustedOfflinePull(c *check.C) {
|
| 247 | 247 |
} |
| 248 | 248 |
|
| 249 | 249 |
if !strings.Contains(string(out), "Tagging") {
|
| 250 |
- c.Fatalf("Missing expected output on trusted push:\n%s", out)
|
|
| 250 |
+ c.Fatalf("Missing expected output on trusted pull:\n%s", out)
|
|
| 251 | 251 |
} |
| 252 | 252 |
|
| 253 | 253 |
dockerCmd(c, "rmi", repoName) |
| ... | ... |
@@ -261,6 +260,6 @@ func (s *DockerTrustSuite) TestTrustedOfflinePull(c *check.C) {
|
| 261 | 261 |
} |
| 262 | 262 |
|
| 263 | 263 |
if !strings.Contains(string(out), "Tagging") {
|
| 264 |
- c.Fatalf("Missing expected output on trusted push:\n%s", out)
|
|
| 264 |
+ c.Fatalf("Missing expected output on trusted pull:\n%s", out)
|
|
| 265 | 265 |
} |
| 266 | 266 |
} |