bugfix: can't stop a paused container #1269
Merged
+146
−9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@shaloulcy can you add some test case for your bugfix, thanks a lot! |
Codecov Report
@@ Coverage Diff @@
## master #1269 +/- ##
==========================================
+ Coverage 15.21% 15.26% +0.04%
==========================================
Files 172 172
Lines 10734 10699 -35
==========================================
Hits 1633 1633
+ Misses 8980 8946 -34
+ Partials 121 120 -1
|
shaloulcy
force-pushed
the
stop_container
branch
3 times, most recently
from
c13ecee to
45e24b7
Compare
shaloulcy
force-pushed
the
stop_container
branch
2 times, most recently
from
769750d to
f1dc4ff
Compare
HusterWan
reviewed
May 4, 2018
| @@ -695,7 +696,7 @@ func (mgr *ContainerManager) Stop(ctx context.Context, name string, timeout int6 | |||
| c.Lock() | |||
| defer c.Unlock() | |||
|
|
|||
| if !c.IsRunning() { | |||
| if !c.IsRunning() && !c.IsPaused() { | |||
There was a problem hiding this comment.
maybe we should also check Restart interface
HusterWan
reviewed
May 4, 2018
| @@ -67,3 +68,31 @@ func (suite *APIContainerStopSuite) TestInvalidParam(c *check.C) { | |||
| //TODO | |||
| // 1. invalid timeout value | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
thanks for adding api test case, it will be great to add more test for cli test :)
shaloulcy
force-pushed
the
stop_container
branch
2 times, most recently
from
e522d01 to
5b307ca
Compare
can't stop a paused container after restart pouch, can't unpause a paused container Signed-off-by: Eric Li <lcy041536@gmail.com>
|
LGTM |
pouchrobot
added
the
LGTM
This was referenced May 4, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
can't stop a paused container
after restart pouch, can't unpause a paused container
Signed-off-by: Eric Li lcy041536@gmail.com
Ⅰ. Describe what this PR did
fixes #1268
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews