opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7568 from rhatdan/latest

Browse Source 
Fix podman ps -l
This commit is contained in:
OpenShift Merge Robot
2020-09-09 10:15:22 -04:00
committed by GitHub
parent 1b2b068ce8 3a7faf7cf8
commit 21cfcc4b3b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/domain/infra/abi/containers.go
View File

@ -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) { 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) return ps.GetContainerLists(ic.Libpod, options)
} }

6
test/e2e/ps_test.go
View File

@ -104,11 +104,13 @@ var _ = Describe("Podman ps", func() {
SkipIfRemote() SkipIfRemote()
_, ec, _ := podmanTest.RunLsContainer("") _, ec, _ := podmanTest.RunLsContainer("")
Expect(ec).To(Equal(0)) 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() result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0)) 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() { It("podman ps last flag", func() {