Browse code
Error should show when trying to start a paused container.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Jessica Frazelle authored on 2015/01/15 09:44:53Showing 2 changed files
| ... | ... |
@@ -22,6 +22,10 @@ func (daemon *Daemon) ContainerStart(job *engine.Job) engine.Status {
|
| 22 | 22 |
return job.Errorf("No such container: %s", name)
|
| 23 | 23 |
} |
| 24 | 24 |
|
| 25 |
+ if container.IsPaused() {
|
|
| 26 |
+ return job.Errorf("Cannot start a paused container, try unpause instead.")
|
|
| 27 |
+ } |
|
| 28 |
+ |
|
| 25 | 29 |
if container.IsRunning() {
|
| 26 | 30 |
return job.Errorf("Container already started")
|
| 27 | 31 |
} |
| ... | ... |
@@ -165,3 +165,25 @@ func TestStartVolumesFromFailsCleanly(t *testing.T) {
|
| 165 | 165 |
|
| 166 | 166 |
logDone("start - missing containers in --volumes-from did not affect subsequent runs")
|
| 167 | 167 |
} |
| 168 |
+ |
|
| 169 |
+func TestStartPausedContainer(t *testing.T) {
|
|
| 170 |
+ defer deleteAllContainers() |
|
| 171 |
+ defer unpauseAllContainers() |
|
| 172 |
+ |
|
| 173 |
+ runCmd := exec.Command(dockerBinary, "run", "-d", "--name", "testing", "busybox", "top") |
|
| 174 |
+ if out, _, err := runCommandWithOutput(runCmd); err != nil {
|
|
| 175 |
+ t.Fatal(out, err) |
|
| 176 |
+ } |
|
| 177 |
+ |
|
| 178 |
+ runCmd = exec.Command(dockerBinary, "pause", "testing") |
|
| 179 |
+ if out, _, err := runCommandWithOutput(runCmd); err != nil {
|
|
| 180 |
+ t.Fatal(out, err) |
|
| 181 |
+ } |
|
| 182 |
+ |
|
| 183 |
+ runCmd = exec.Command(dockerBinary, "start", "testing") |
|
| 184 |
+ if out, _, err := runCommandWithOutput(runCmd); err == nil || !strings.Contains(out, "Cannot start a paused container, try unpause instead.") {
|
|
| 185 |
+ t.Fatalf("an error should have been shown that you cannot start paused container: %s\n%v", out, err)
|
|
| 186 |
+ } |
|
| 187 |
+ |
|
| 188 |
+ logDone("start - error should show if trying to start paused container")
|
|
| 189 |
+} |