fix: make stop stopped container return no error

Signed-off-by: Allen Sun <[email protected]>
AliyunContainerService · Apr 25, 2018 · 9e5a042 · 9e5a042
1 parent 0713c83
commit 9e5a042
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/daemon/mgr/container.go b/daemon/mgr/container.go
@@ -706,10 +706,6 @@ func (mgr *ContainerManager) Stop(ctx context.Context, name string, timeout int6
 	c.Lock()
 	defer c.Unlock()
 
-	if !c.IsRunning() {
-		return fmt.Errorf("container's status is not running: %s", c.meta.State.Status)
-	}
-
 	if timeout == 0 {
 		timeout = c.StopTimeout()
 	}

diff --git a/test/cli_stop_test.go b/test/cli_stop_test.go
@@ -41,6 +41,9 @@ func (suite *PouchStopSuite) TestStopWorks(c *check.C) {
 
 	command.PouchRun("start", name).Assert(c, icmd.Success)
 
+	// test stop a running container
+	command.PouchRun("stop", name).Assert(c, icmd.Success)
+	// test stop a stopped container
 	command.PouchRun("stop", name).Assert(c, icmd.Success)
 
 	res := command.PouchRun("ps", "-a")