Skip to content

Commit

Permalink
Merge pull request #10107 from jfrazelle/9328-fix-try-start-paused-co…
Browse files Browse the repository at this point in the history
…ntainer

Error should show when trying to start a paused container.
  • Loading branch information
vieux committed Jan 15, 2015
2 parents 95c0f07 + 02246d2 commit 27f69b0
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
4 changes: 4 additions & 0 deletions daemon/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ func (daemon *Daemon) ContainerStart(job *engine.Job) engine.Status {
return job.Errorf("No such container: %s", name)
}

if container.IsPaused() {
return job.Errorf("Cannot start a paused container, try unpause instead.")
}

if container.IsRunning() {
return job.Errorf("Container already started")
}
Expand Down
22 changes: 22 additions & 0 deletions integration-cli/docker_cli_start_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,25 @@ func TestStartVolumesFromFailsCleanly(t *testing.T) {

logDone("start - missing containers in --volumes-from did not affect subsequent runs")
}

func TestStartPausedContainer(t *testing.T) {
defer deleteAllContainers()
defer unpauseAllContainers()

runCmd := exec.Command(dockerBinary, "run", "-d", "--name", "testing", "busybox", "top")
if out, _, err := runCommandWithOutput(runCmd); err != nil {
t.Fatal(out, err)
}

runCmd = exec.Command(dockerBinary, "pause", "testing")
if out, _, err := runCommandWithOutput(runCmd); err != nil {
t.Fatal(out, err)
}

runCmd = exec.Command(dockerBinary, "start", "testing")
if out, _, err := runCommandWithOutput(runCmd); err == nil || !strings.Contains(out, "Cannot start a paused container, try unpause instead.") {
t.Fatalf("an error should have been shown that you cannot start paused container: %s\n%v", out, err)
}

logDone("start - error should show if trying to start paused container")
}

0 comments on commit 27f69b0

Please sign in to comment.