diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-09 10:15:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 10:15:22 -0400 |
| commit | 21cfcc4b3b19273a26cd4bb78072061109b1ed42 (patch) | |
| tree | 00ddc7a31f51e28898c6cf8f150691696fa581fc | |
| parent | 1b2b068ce89a52d46cfd3191ed6bbf403e7582e9 (diff) | |
| parent | 3a7faf7cf838586adab805ea3c2b65ac5ee9a079 (diff) | |
| download | podman-21cfcc4b3b19273a26cd4bb78072061109b1ed42.tar.gz podman-21cfcc4b3b19273a26cd4bb78072061109b1ed42.tar.bz2 podman-21cfcc4b3b19273a26cd4bb78072061109b1ed42.zip | |
Merge pull request #7568 from rhatdan/latest
Fix podman ps -l
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 3 | ||||
| -rw-r--r-- | test/e2e/ps_test.go | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 0537942e6..21618f555 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -798,6 +798,9 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri } func (ic *ContainerEngine) ContainerList(ctx context.Context, options entities.ContainerListOptions) ([]entities.ListContainer, error) { + if options.Latest { + options.Last = 1 + } return ps.GetContainerLists(ic.Libpod, options) } diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index a734d399d..a2338c924 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -104,11 +104,13 @@ var _ = Describe("Podman ps", func() { SkipIfRemote() _, ec, _ := podmanTest.RunLsContainer("") Expect(ec).To(Equal(0)) + _, ec, _ = podmanTest.RunLsContainer("") + Expect(ec).To(Equal(0)) - result := podmanTest.Podman([]string{"ps", "--latest"}) + result := podmanTest.Podman([]string{"ps", "-q", "--latest"}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) - Expect(len(result.OutputToStringArray())).Should(BeNumerically(">", 0)) + Expect(len(result.OutputToStringArray())).Should(Equal(1)) }) It("podman ps last flag", func() { |