opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 10:38:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6855 from Luap99/ps-command-trunc

Browse Source 
podman ps truncate the command
This commit is contained in:
OpenShift Merge Robot
2020-07-06 09:33:23 -04:00
committed by GitHub
parent 9bccb0f091 b3dd42a797
commit 262843e1ce
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/podman/containers/ps.go
View File

@ -309,7 +309,13 @@ func (l psReporter) Status() string {
// Command returns the container command in string format // Command returns the container command in string format
func (l psReporter) Command() string { func (l psReporter) Command() string {
return strings.Join(l.ListContainer.Command, " ") command := strings.Join(l.ListContainer.Command, " ")
if !noTrunc {
if len(command) > 17 {
return command[0:17] + "..."
}
}
return command
} }
// Size returns the rootfs and virtual sizes in human duration in // Size returns the rootfs and virtual sizes in human duration in

11
test/e2e/ps_test.go
View File

@ -466,4 +466,15 @@ var _ = Describe("Podman ps", func() {
Expect(ps.ExitCode()).To(Equal(0)) Expect(ps.ExitCode()).To(Equal(0))
Expect(ps.OutputToString()).To(ContainSubstring("0.0.0.0:8080->80/tcp")) Expect(ps.OutputToString()).To(ContainSubstring("0.0.0.0:8080->80/tcp"))
}) })
It("podman ps truncate long create commad", func() {
session := podmanTest.Podman([]string{"run", ALPINE, "echo", "very", "long", "create", "command"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
session = podmanTest.Podman([]string{"ps", "-a"})
session.WaitWithDefaultTimeout()
Expect(session.OutputToString()).To(ContainSubstring("echo very long cr..."))
})
}) })