diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-03 15:16:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 15:16:53 +0200 |
| commit | 0eaba2d56a48c68e1d08e287a1c9eb5405cc743a (patch) | |
| tree | 29f4b20794d7c69ecebd3f71aa4491a13034b406 /test/e2e/pod_top_test.go | |
| parent | a7809fabe508e26c527490e700a1703ef923bd3b (diff) | |
| parent | 0d2d52339058a19e66ecc75f78c52596054c7dad (diff) | |
| download | podman-0eaba2d56a48c68e1d08e287a1c9eb5405cc743a.tar.gz podman-0eaba2d56a48c68e1d08e287a1c9eb5405cc743a.tar.bz2 podman-0eaba2d56a48c68e1d08e287a1c9eb5405cc743a.zip | |
Merge pull request #3034 from vrothberg/top-fallback
top: fallback to execing ps(1)
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)) }) |