Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make stopping non-running container valid #1210

Merged
merged 1 commit into from
Apr 25, 2018
Merged

fix: make stopping non-running container valid #1210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions daemon/mgr/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,8 +709,8 @@ func (mgr *ContainerManager) Stop(ctx context.Context, name string, timeout int6
c.Lock()
defer c.Unlock()

if c.IsStopped() {
// stopping a stopped container is valid.
if !c.IsRunning() {
// stopping a non-running container is valid.
return nil
}

Expand Down
4 changes: 4 additions & 0 deletions test/cli_stop_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ func (suite *PouchStopSuite) TestStopWorks(c *check.C) {
command.PouchRun("create", "--name", name, busyboxImage, "top").Assert(c, icmd.Success)
defer DelContainerForceMultyTime(c, name)

// test stop a created container
command.PouchRun("stop", name).Assert(c, icmd.Success)

// start the created container
command.PouchRun("start", name).Assert(c, icmd.Success)

// test stop a running container
Expand Down