diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2019-04-29 11:21:55 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2019-05-03 11:20:16 +0200 |
| commit | 0d2d52339058a19e66ecc75f78c52596054c7dad (patch) | |
| tree | 73636772d105d249a996ee145b0afd48fddf16ab /test/e2e/pod_top_test.go | |
| parent | d9d9c82184ad6d7e3fad07dfe2e99b158560d3a8 (diff) | |
| download | podman-0d2d52339058a19e66ecc75f78c52596054c7dad.tar.gz podman-0d2d52339058a19e66ecc75f78c52596054c7dad.tar.bz2 podman-0d2d52339058a19e66ecc75f78c52596054c7dad.zip | |
top: fallback to execing ps(1)
Fallback to executing ps(1) in case we hit an unknown psgo descriptor.
This ensures backwards compatibility with docker-top, which was purely
ps(1) driven.
Also support comma-separated descriptors as input.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'test/e2e/pod_top_test.go')
| -rw-r--r-- | test/e2e/pod_top_test.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go index 964ee075f..420e4aca9 100644 --- a/test/e2e/pod_top_test.go +++ b/test/e2e/pod_top_test.go @@ -93,7 +93,11 @@ var _ = Describe("Podman top", func() { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - result := podmanTest.Podman([]string{"pod", "top", podid, "invalid"}) + // We need to pass -eo to force executing ps in the Alpine container. + // Alpines stripped down ps(1) is accepting any kind of weird input in + // contrast to others, such that a `ps invalid` will silently ignore + // the wrong input and still print the -ef output instead. + result := podmanTest.Podman([]string{"pod", "top", podid, "-eo", "invalid"}) result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(125)) }) |