From c6b205be77fb2a50772cd31267e09503ecd8b6bc Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 14 Mar 2019 12:03:42 -0500 Subject: Enable rootless integration tests Signed-off-by: baude --- test/e2e/ps_test.go | 1 + 1 file changed, 1 insertion(+) (limited to 'test/e2e/ps_test.go') diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index 92ca538f0..dc29a8f20 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -305,6 +305,7 @@ var _ = Describe("Podman ps", func() { }) It("podman ps test with port range", func() { + SkipIfRootless() session := podmanTest.RunTopContainer("") session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) -- cgit v1.2.3-54-g00ecf From 4ac08d3aa1882851d4a03aa1e53c47c6fb173958 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 19 Mar 2019 10:38:56 +0100 Subject: ps: fix segfault if the store is not initialized Signed-off-by: Giuseppe Scrivano --- libpod/container_internal.go | 3 +++ test/e2e/ps_test.go | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'test/e2e/ps_test.go') diff --git a/libpod/container_internal.go b/libpod/container_internal.go index ac2d65342..13e660dc3 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -51,6 +51,9 @@ func (c *Container) rootFsSize() (int64, error) { if c.config.Rootfs != "" { return 0, nil } + if c.runtime.store == nil { + return 0, nil + } container, err := c.runtime.store.Container(c.ID()) if err != nil { diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index dc29a8f20..957c69aa8 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -82,6 +82,8 @@ var _ = Describe("Podman ps", func() { }) It("podman ps size flag", func() { + SkipIfRootless() + _, ec, _ := podmanTest.RunLsContainer("") Expect(ec).To(Equal(0)) @@ -233,6 +235,8 @@ var _ = Describe("Podman ps", func() { }) It("podman --sort by size", func() { + SkipIfRootless() + session := podmanTest.Podman([]string{"create", "busybox", "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) -- cgit v1.2.3-54-g00ecf