Signed-off-by: Tibor Vass <tibor@docker.com>
Tibor Vass authored on 2015/02/10 08:01:52... | ... |
@@ -1796,7 +1796,7 @@ func TestBuildWithInaccessibleFilesInContext(t *testing.T) { |
1796 | 1796 |
} |
1797 | 1797 |
|
1798 | 1798 |
} |
1799 |
- logDone("build - ADD from context with inaccessible files must fail") |
|
1799 |
+ logDone("build - ADD from context with inaccessible files must not pass") |
|
1800 | 1800 |
logDone("build - ADD from context with accessible links must work") |
1801 | 1801 |
logDone("build - ADD from context with ignored inaccessible files must work") |
1802 | 1802 |
} |
... | ... |
@@ -2169,7 +2169,7 @@ func TestBuildContextCleanupFailedBuild(t *testing.T) { |
2169 | 2169 |
t.Fatalf("context should have been deleted, but wasn't") |
2170 | 2170 |
} |
2171 | 2171 |
|
2172 |
- logDone("build - verify context cleanup works properly after a failed build") |
|
2172 |
+ logDone("build - verify context cleanup works properly after an unsuccessful build") |
|
2173 | 2173 |
} |
2174 | 2174 |
|
2175 | 2175 |
func TestBuildCmd(t *testing.T) { |
... | ... |
@@ -3206,7 +3206,7 @@ func TestBuildFails(t *testing.T) { |
3206 | 3206 |
} else { |
3207 | 3207 |
t.Fatal("Error must not be nil") |
3208 | 3208 |
} |
3209 |
- logDone("build - fails") |
|
3209 |
+ logDone("build - unsuccessful") |
|
3210 | 3210 |
} |
3211 | 3211 |
|
3212 | 3212 |
func TestBuildFailsDockerfileEmpty(t *testing.T) { |
... | ... |
@@ -3220,7 +3220,7 @@ func TestBuildFailsDockerfileEmpty(t *testing.T) { |
3220 | 3220 |
} else { |
3221 | 3221 |
t.Fatal("Error must not be nil") |
3222 | 3222 |
} |
3223 |
- logDone("build - fails with empty dockerfile") |
|
3223 |
+ logDone("build - unsuccessful with empty dockerfile") |
|
3224 | 3224 |
} |
3225 | 3225 |
|
3226 | 3226 |
func TestBuildOnBuild(t *testing.T) { |
... | ... |
@@ -4327,7 +4327,7 @@ func TestBuildVerifySingleQuoteFails(t *testing.T) { |
4327 | 4327 |
t.Fatal("The image was not supposed to be able to run") |
4328 | 4328 |
} |
4329 | 4329 |
|
4330 |
- logDone("build - verify single quotes fail") |
|
4330 |
+ logDone("build - verify single quotes break the build") |
|
4331 | 4331 |
} |
4332 | 4332 |
|
4333 | 4333 |
func TestBuildVerboseOut(t *testing.T) { |
... | ... |
@@ -93,7 +93,7 @@ func TestEventsContainerFailStartDie(t *testing.T) { |
93 | 93 |
t.Fatalf("event should be die, not %#v", dieEvent) |
94 | 94 |
} |
95 | 95 |
|
96 |
- logDone("events - container failed to start logs die") |
|
96 |
+ logDone("events - container unwilling to start logs die") |
|
97 | 97 |
} |
98 | 98 |
|
99 | 99 |
func TestEventsLimit(t *testing.T) { |
... | ... |
@@ -71,7 +71,7 @@ func TestHistoryExistentImage(t *testing.T) { |
71 | 71 |
if err != nil || exitCode != 0 { |
72 | 72 |
t.Fatal("failed to get image history") |
73 | 73 |
} |
74 |
- logDone("history - history on existent image must not fail") |
|
74 |
+ logDone("history - history on existent image must pass") |
|
75 | 75 |
} |
76 | 76 |
|
77 | 77 |
func TestHistoryNonExistentImage(t *testing.T) { |
... | ... |
@@ -80,5 +80,5 @@ func TestHistoryNonExistentImage(t *testing.T) { |
80 | 80 |
if err == nil || exitCode == 0 { |
81 | 81 |
t.Fatal("history on a non-existent image didn't result in a non-zero exit status") |
82 | 82 |
} |
83 |
- logDone("history - history on non-existent image must fail") |
|
83 |
+ logDone("history - history on non-existent image must pass") |
|
84 | 84 |
} |
... | ... |
@@ -193,7 +193,7 @@ func TestLinksNotStartedParentNotFail(t *testing.T) { |
193 | 193 |
if err != nil { |
194 | 194 |
t.Fatal(out, err) |
195 | 195 |
} |
196 |
- logDone("link - container start not failing on updating stopped parent links") |
|
196 |
+ logDone("link - container start successfully updating stopped parent links") |
|
197 | 197 |
} |
198 | 198 |
|
199 | 199 |
func TestLinksHostsFilesInject(t *testing.T) { |
... | ... |
@@ -37,7 +37,7 @@ func TestPushUnprefixedRepo(t *testing.T) { |
37 | 37 |
if out, _, err := runCommandWithOutput(pushCmd); err == nil { |
38 | 38 |
t.Fatalf("pushing an unprefixed repo didn't result in a non-zero exit status: %s", out) |
39 | 39 |
} |
40 |
- logDone("push - unprefixed busybox repo must fail") |
|
40 |
+ logDone("push - unprefixed busybox repo must not pass") |
|
41 | 41 |
} |
42 | 42 |
|
43 | 43 |
func TestPushUntagged(t *testing.T) { |
... | ... |
@@ -1398,7 +1398,7 @@ func TestRunDisallowBindMountingRootToRoot(t *testing.T) { |
1398 | 1398 |
|
1399 | 1399 |
deleteAllContainers() |
1400 | 1400 |
|
1401 |
- logDone("run - bind mount /:/ as volume should fail") |
|
1401 |
+ logDone("run - bind mount /:/ as volume should not work") |
|
1402 | 1402 |
} |
1403 | 1403 |
|
1404 | 1404 |
// Verify that a container gets default DNS when only localhost resolvers exist |
... | ... |
@@ -2234,7 +2234,7 @@ func TestRunCidFileCleanupIfEmpty(t *testing.T) { |
2234 | 2234 |
t.Fatalf("empty CIDFile %q should've been deleted", tmpCidFile) |
2235 | 2235 |
} |
2236 | 2236 |
deleteAllContainers() |
2237 |
- logDone("run - cleanup empty cidfile on fail") |
|
2237 |
+ logDone("run - cleanup empty cidfile on error") |
|
2238 | 2238 |
} |
2239 | 2239 |
|
2240 | 2240 |
// #2098 - Docker cidFiles only contain short version of the containerId |
... | ... |
@@ -2367,7 +2367,7 @@ func TestRunPortInUse(t *testing.T) { |
2367 | 2367 |
} |
2368 | 2368 |
|
2369 | 2369 |
deleteAllContainers() |
2370 |
- logDone("run - fail if port already in use") |
|
2370 |
+ logDone("run - error out if port already in use") |
|
2371 | 2371 |
} |
2372 | 2372 |
|
2373 | 2373 |
// https://github.com/docker/docker/issues/8428 |
... | ... |
@@ -135,7 +135,7 @@ func TestStartRecordError(t *testing.T) { |
135 | 135 |
t.Fatalf("Expected to not have state error but got state.Error(%q)", stateErr) |
136 | 136 |
} |
137 | 137 |
|
138 |
- logDone("start - set state error when start fails") |
|
138 |
+ logDone("start - set state error when start is unsuccessful") |
|
139 | 139 |
} |
140 | 140 |
|
141 | 141 |
// gh#8726: a failed Start() breaks --volumes-from on subsequent Start()'s |
... | ... |
@@ -54,7 +54,7 @@ func TestTagInvalidUnprefixedRepo(t *testing.T) { |
54 | 54 |
t.Fatalf("tag busybox %v should have failed", repo) |
55 | 55 |
} |
56 | 56 |
} |
57 |
- logDone("tag - busybox invalid repo names --> must fail") |
|
57 |
+ logDone("tag - busybox invalid repo names --> must not work") |
|
58 | 58 |
} |
59 | 59 |
|
60 | 60 |
// ensure we don't allow the use of invalid tags; these tag operations should fail |
... | ... |
@@ -70,7 +70,7 @@ func TestTagInvalidPrefixedRepo(t *testing.T) { |
70 | 70 |
t.Fatalf("tag busybox %v should have failed", repotag) |
71 | 71 |
} |
72 | 72 |
} |
73 |
- logDone("tag - busybox with invalid repo:tagnames --> must fail") |
|
73 |
+ logDone("tag - busybox with invalid repo:tagnames --> must not work") |
|
74 | 74 |
} |
75 | 75 |
|
76 | 76 |
// ensure we allow the use of valid tags |
... | ... |
@@ -111,7 +111,7 @@ func TestTagExistedNameWithoutForce(t *testing.T) { |
111 | 111 |
} |
112 | 112 |
deleteImages("busybox:test") |
113 | 113 |
|
114 |
- logDone("tag - busybox with an existed tag name without -f option --> must fail") |
|
114 |
+ logDone("tag - busybox with an existed tag name without -f option --> must not work") |
|
115 | 115 |
} |
116 | 116 |
|
117 | 117 |
// tag an image with an existed tag name with -f option should work |