InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

make client side know container removal in progress

Browse Source 
Signed-off-by: allencloud <allen.sun@daocloud.io>
This commit is contained in:
allencloud
2016-08-27 21:39:34 +08:00
parent b826bebda0
commit 9a58f298d1
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/delete_test.go
View File

@@ -1,6 +1,7 @@
package daemon
import (
"fmt"
"io/ioutil"
"os"
"testing"
@@ -34,9 +35,9 @@ func TestContainerDoubleDelete(t *testing.T) {
// Mark the container as having a delete in progress
container.SetRemovalInProgress()
// Try to remove the container when its start is removalInProgress.
// It should ignore the container and not return an error.
if err := daemon.ContainerRm(container.ID, &types.ContainerRmConfig{ForceRemove: true}); err != nil {
t.Fatal(err)
// Try to remove the container when its state is removalInProgress.
// It should return an error indicating it is under removal progress.
if err := daemon.ContainerRm(container.ID, &types.ContainerRmConfig{ForceRemove: true}); err == nil {
t.Fatalf("expected err: %v, got nil", fmt.Sprintf("removal of container %s is already in progress", container.ID))
}
}