summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2020-01-10 09:47:19 -0600
committerbaude <bbaude@redhat.com>2020-01-10 09:47:19 -0600
commitc3956b1974ce545446a443488497dfbc98dda1a8 (patch)
tree99f3257f307d40cd20f1aabd0666ebac1fb77851 /libpod
parent25b34972f4c58ede6528e3ae25c54c29eb9034e1 (diff)
downloadpodman-c3956b1974ce545446a443488497dfbc98dda1a8.tar.gz
podman-c3956b1974ce545446a443488497dfbc98dda1a8.tar.bz2
podman-c3956b1974ce545446a443488497dfbc98dda1a8.zip
address review comments before merge
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_internal.go12
1 files changed, 4 insertions, 8 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 1d118dcb0..46c83149a 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -1195,10 +1195,8 @@ func (c *Container) pause() error {
}
if err := c.ociRuntime.PauseContainer(c); err != nil {
- // TODO disabling to pass dockerpy tests. there is some sort of problem and perhaps
- //a race going on here.
- logrus.Error(err)
- //return err
+ // TODO when using docker-py there is some sort of race/incompatibility here
+ return err
}
logrus.Debugf("Paused container %s", c.ID())
@@ -1215,10 +1213,8 @@ func (c *Container) unpause() error {
}
if err := c.ociRuntime.UnpauseContainer(c); err != nil {
- // TODO disabling to pass dockerpy tests. there is some sort of problem and perhaps
- //a race going on here.
- logrus.Error(err)
- //return err
+ // TODO when using docker-py there is some sort of race/incompatibility here
+ return err
}
logrus.Debugf("Unpaused container %s", c.ID())