summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2017-11-28 16:53:46 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-11-29 12:15:16 +0000
commit66ed73f89f532c093dd42d84e8c004421e6d2962 (patch)
tree35bed1bc8657a7c95b2e86773c9297a781b9760e /libpod
parente36483b1e644f8fb6f14a62c062ea635fb6851ed (diff)
downloadpodman-66ed73f89f532c093dd42d84e8c004421e6d2962.tar.gz
podman-66ed73f89f532c093dd42d84e8c004421e6d2962.tar.bz2
podman-66ed73f89f532c093dd42d84e8c004421e6d2962.zip
First pass at fixing test errors
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #68 Approved by: rhatdan
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container.go8
-rw-r--r--libpod/runtime_ctr.go2
2 files changed, 4 insertions, 6 deletions
diff --git a/libpod/container.go b/libpod/container.go
index 8a2ff1fad..913d989ca 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -141,7 +141,7 @@ func (t ContainerState) String() string {
case ContainerStatePaused:
return "paused"
}
- return ""
+ return "bad state"
}
// ID returns the container's ID
@@ -566,10 +566,8 @@ func (c *Container) Kill(signal uint) error {
return err
}
- if c.state.State == ContainerStateUnknown ||
- c.state.State == ContainerStateConfigured ||
- c.state.State == ContainerStatePaused {
- return errors.Wrapf(ErrCtrStateInvalid, "can only kill created, running, or stopped containers")
+ if c.state.State != ContainerStateRunning {
+ return errors.Wrapf(ErrCtrStateInvalid, "can only kill running containers")
}
return c.runtime.ociRuntime.killContainer(c, signal)
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index 9a91e0a48..cf669eeb4 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -106,7 +106,7 @@ func (r *Runtime) RemoveContainer(c *Container, force bool) error {
} else if !(c.state.State == ContainerStateConfigured ||
c.state.State == ContainerStateCreated ||
c.state.State == ContainerStateStopped) {
- return errors.Wrapf(ErrCtrStateInvalid, "cannot remove container %s as it is running or paused", c.ID())
+ return errors.Wrapf(ErrCtrStateInvalid, "cannot remove container %s as it is %s - running or paused containers cannot be removed", c.ID(), c.state.State.String())
}
// Stop the container's storage