diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-24 18:36:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 18:36:20 +0200 |
| commit | a1a4a75abee2c381483a218e1660621ee416ef7c (patch) | |
| tree | 5e71546462cfe62672e977305b4c325ec58f377c | |
| parent | 72260a296c534950d9c899ee907e73b5dd0162f0 (diff) | |
| parent | de75b1a2778fa08d50ecf573b3259b32b68912d7 (diff) | |
| download | podman-a1a4a75abee2c381483a218e1660621ee416ef7c.tar.gz podman-a1a4a75abee2c381483a218e1660621ee416ef7c.tar.bz2 podman-a1a4a75abee2c381483a218e1660621ee416ef7c.zip | |
Merge pull request #3412 from mheon/fix_ps_sync_segfault
Fix a segfault in 'podman ps --sync'
| -rw-r--r-- | libpod/container_api.go | 1 | ||||
| -rw-r--r-- | test/e2e/ps_test.go | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index ed3e08dc7..370e3e5d9 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -627,6 +627,7 @@ func (c *Container) Batch(batchFunc func(*Container) error) error { newCtr.config = c.config newCtr.state = c.state newCtr.runtime = c.runtime + newCtr.ociRuntime = c.ociRuntime newCtr.lock = c.lock newCtr.valid = true diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index b0a28501a..2b86f663f 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -320,4 +320,16 @@ var _ = Describe("Podman ps", func() { session.WaitWithDefaultTimeout() Expect(session.OutputToString()).To(ContainSubstring("0.0.0.0:1000-1006")) }) + + It("podman ps sync flag", func() { + session := podmanTest.RunTopContainer("") + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + fullCid := session.OutputToString() + + result := podmanTest.Podman([]string{"ps", "-q", "--no-trunc", "--sync"}) + result.WaitWithDefaultTimeout() + Expect(result.ExitCode()).To(Equal(0)) + Expect(result.OutputToStringArray()[0]).To(Equal(fullCid)) + }) }) |