diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-10-08 15:37:44 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-10-08 18:19:37 -0700 |
| commit | f128bff232a9d9ee14376af83e7f917d3c47ceb8 (patch) | |
| tree | 309941d317368f01439450303542f1e6d102c798 /test/e2e | |
| parent | 2587cba3899213356575f01cc0aa226c0209b8ae (diff) | |
| download | podman-f128bff232a9d9ee14376af83e7f917d3c47ceb8.tar.gz podman-f128bff232a9d9ee14376af83e7f917d3c47ceb8.tar.bz2 podman-f128bff232a9d9ee14376af83e7f917d3c47ceb8.zip | |
Restore --format table...
Following commands:
* systemd generate
* networks inspect
* pod stats
* Fixed test where format was quoted and then quoted again
* Fixed bug where output never printed '--' on missed reads
* pod ps
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/pod_ps_test.go | 3 | ||||
| -rw-r--r-- | test/e2e/pod_stats_test.go | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index 17ed6a9c0..a299d3cf2 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -8,6 +8,7 @@ import ( . "github.com/containers/podman/v2/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman ps", func() { @@ -63,7 +64,7 @@ var _ = Describe("Podman ps", func() { result := podmanTest.Podman([]string{"pod", "ps", "-q"}) result.WaitWithDefaultTimeout() - Expect(result.ExitCode()).To(Equal(0)) + Expect(result).To(Exit(0)) Expect(len(result.OutputToStringArray())).Should(BeNumerically(">", 0)) Expect(podid).To(ContainSubstring(result.OutputToStringArray()[0])) }) diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index 1ffbe282b..41fc59267 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -6,6 +6,7 @@ import ( . "github.com/containers/podman/v2/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman pod stats", func() { @@ -156,9 +157,9 @@ var _ = Describe("Podman pod stats", func() { session := podmanTest.RunTopContainerInPod("", podid) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - stats := podmanTest.Podman([]string{"pod", "stats", "-a", "--no-reset", "--no-stream", "--format", "\"table {{.CID}} {{.Pod}} {{.Mem}} {{.MemUsage}} {{.CPU}} {{.NetIO}} {{.BlockIO}} {{.PIDS}} {{.Pod}}\""}) + stats := podmanTest.Podman([]string{"pod", "stats", "-a", "--no-reset", "--no-stream", "--format", "table {{.CID}} {{.Pod}} {{.Mem}} {{.MemUsage}} {{.CPU}} {{.NetIO}} {{.BlockIO}} {{.PIDS}} {{.Pod}}"}) stats.WaitWithDefaultTimeout() - Expect(stats.ExitCode()).To(Equal(0)) + Expect(stats).To(Exit(0)) }) It("podman stats with invalid GO template", func() { |