diff options
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/network_test.go | 7 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index a7eb6e629..53521cdc4 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -150,6 +150,13 @@ var _ = Describe("Podman network", func() { defer podmanTest.removeCNINetwork(net) Expect(session.ExitCode()).To(BeZero()) + // Tests Default Table Output + session = podmanTest.Podman([]string{"network", "ls", "--filter", "id=" + netID}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(BeZero()) + expectedTable := "NETWORK ID NAME VERSION PLUGINS" + Expect(session.OutputToString()).To(ContainSubstring(expectedTable)) + session = podmanTest.Podman([]string{"network", "ls", "--format", "{{.Name}} {{.ID}}", "--filter", "id=" + netID}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(BeZero()) diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index c28086fe8..f0ba9d1d9 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -1228,9 +1228,10 @@ USER mail` for _, line := range lines { parts := strings.SplitN(line, ":", 3) if !CGROUPSV2 { - // ignore unified on cgroup v1 + // ignore unified on cgroup v1. // both runc and crun do not set it. - if parts[1] == "" { + // crun does not set named hierarchies. + if parts[1] == "" || strings.Contains(parts[1], "name=") { continue } } |