Signed-off-by: Tibor Vass <teabee89@gmail.com>
| ... | ... |
@@ -152,7 +152,7 @@ func TestRestartWithVolumes(t *testing.T) {
|
| 152 | 152 |
logDone("restart - does not create a new volume on restart")
|
| 153 | 153 |
} |
| 154 | 154 |
|
| 155 |
-func TestRecordRestartPolicyNO(t *testing.T) {
|
|
| 155 |
+func TestRestartPolicyNO(t *testing.T) {
|
|
| 156 | 156 |
defer deleteAllContainers() |
| 157 | 157 |
|
| 158 | 158 |
cmd := exec.Command(dockerBinary, "run", "-d", "--restart=no", "busybox", "false") |
| ... | ... |
@@ -173,7 +173,7 @@ func TestRecordRestartPolicyNO(t *testing.T) {
|
| 173 | 173 |
logDone("restart - recording restart policy name for --restart=no")
|
| 174 | 174 |
} |
| 175 | 175 |
|
| 176 |
-func TestRecordRestartPolicyAlways(t *testing.T) {
|
|
| 176 |
+func TestRestartPolicyAlways(t *testing.T) {
|
|
| 177 | 177 |
defer deleteAllContainers() |
| 178 | 178 |
|
| 179 | 179 |
cmd := exec.Command(dockerBinary, "run", "-d", "--restart=always", "busybox", "false") |
| ... | ... |
@@ -191,16 +191,10 @@ func TestRecordRestartPolicyAlways(t *testing.T) {
|
| 191 | 191 |
t.Fatalf("Container restart policy name is %s, expected %s", name, "always")
|
| 192 | 192 |
} |
| 193 | 193 |
|
| 194 |
- cmd = exec.Command(dockerBinary, "stop", id) |
|
| 195 |
- out, _, err = runCommandWithOutput(cmd) |
|
| 196 |
- if err != nil {
|
|
| 197 |
- t.Fatal(err, out) |
|
| 198 |
- } |
|
| 199 |
- |
|
| 200 | 194 |
logDone("restart - recording restart policy name for --restart=always")
|
| 201 | 195 |
} |
| 202 | 196 |
|
| 203 |
-func TestRecordRestartPolicyOnFailure(t *testing.T) {
|
|
| 197 |
+func TestRestartPolicyOnFailure(t *testing.T) {
|
|
| 204 | 198 |
defer deleteAllContainers() |
| 205 | 199 |
|
| 206 | 200 |
cmd := exec.Command(dockerBinary, "run", "-d", "--restart=on-failure:1", "busybox", "false") |