diff options
author | Valentin Rothberg <vrothberg@suse.com> | 2018-06-13 08:59:59 +0200 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-18 12:56:44 +0000 |
commit | b1e709806dd628b542bda4dc823ff8c0ca870110 (patch) | |
tree | 0364b6ca7e550f298299949f9bb6a5e379bb3854 /test/e2e/top_test.go | |
parent | 9e134576e8eb047466706fa71a201def6d5d8159 (diff) | |
download | podman-b1e709806dd628b542bda4dc823ff8c0ca870110.tar.gz podman-b1e709806dd628b542bda4dc823ff8c0ca870110.tar.bz2 podman-b1e709806dd628b542bda4dc823ff8c0ca870110.zip |
top: make output tabular
Make the output of top tabular to be compatible with Docker. Please
note, that any user-input for `GetContainerPidInformation(...)` will be
ignored until we have found a way to generically and reliably parse ps-1
output or until there is a go-lib to extract all the data from /proc in
a ps-1 compatible fashion.
Fixes: #458
Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
Closes: #939
Approved by: rhatdan
Diffstat (limited to 'test/e2e/top_test.go')
-rw-r--r-- | test/e2e/top_test.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go index 4b4cb47e4..e7ac90219 100644 --- a/test/e2e/top_test.go +++ b/test/e2e/top_test.go @@ -59,7 +59,14 @@ var _ = Describe("Podman top", func() { Expect(len(result.OutputToStringArray())).To(BeNumerically(">", 1)) }) + // XXX(ps-issue): for the time being, podman-top and the libpod API + // GetContainerPidInformation(...) will ignore any arguments passed to ps, + // so we have to disable the tests below. Please refer to + // https://github.com/projectatomic/libpod/pull/939 for more background + // information. + It("podman top with options", func() { + Skip("podman-top with options: options are temporarily ignored") session := podmanTest.Podman([]string{"run", "-d", ALPINE, "top", "-d", "2"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -71,6 +78,7 @@ var _ = Describe("Podman top", func() { }) It("podman top on container invalid options", func() { + Skip("podman-top with invalid options: options are temporarily ignored") top := podmanTest.RunTopContainer("") top.WaitWithDefaultTimeout() Expect(top.ExitCode()).To(Equal(0)) |