Merge pull request #9583 from brahmaroutu/remove_container_9569

Error should be 409 as the container is different state to remove
Upstream-commit: 1e2d0d17d98e25cd315a60ab6ca83c1662ebe649
Component: engine

components/engine/daemon/delete.go

@@ -55,7 +55,7 @@ func (daemon *Daemon) ContainerRm(job *engine.Job) engine.Status {
 					return job.Errorf("Could not kill running container, cannot remove - %v", err)
 				}
 			} else {
-				return job.Errorf("You cannot remove a running container. Stop the container before attempting removal or use -f")
+				return job.Errorf("Conflict, You cannot remove a running container. Stop the container before attempting removal or use -f")
 			}
 		}
 		if err := daemon.Destroy(container); err != nil {

components/engine/integration-cli/docker_cli_rm_test.go

@@ -57,6 +57,24 @@ func TestRmRunningContainer(t *testing.T) {
 	logDone("rm - running container")
 }
 
+func TestRmRunningContainerCheckError409(t *testing.T) {
+	createRunningContainer(t, "foo")
+
+	endpoint := "/containers/foo"
+	_, err := sockRequest("DELETE", endpoint, nil)
+
+	if err == nil {
+		t.Fatalf("Expected error, can't rm a running container")
+	}
+	if !strings.Contains(err.Error(), "409 Conflict") {
+		t.Fatalf("Expected error to contain '409 Conflict' but found", err)
+	}
+
+	deleteAllContainers()
+
+	logDone("rm - running container")
+}
+
 func TestRmForceRemoveRunningContainer(t *testing.T) {
 	createRunningContainer(t, "foo")