Sfoglia il codice sorgente

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 10 anni fa
parent
commit
02246d2d9f
2 ha cambiato i file con 26 aggiunte e 0 eliminazioni
  1. 4 0
      daemon/start.go
  2. 22 0
      integration-cli/docker_cli_start_test.go

+ 4 - 0
daemon/start.go

@@ -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")
 	}

+ 22 - 0
integration-cli/docker_cli_start_test.go

@@ -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")
+}