3 files changed, 49 insertions, 5 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 359345096..7ffee961c 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -408,7 +408,14 @@ func (p *PodmanTestIntegration) RunLsContainer(name string) (*PodmanSessionInteg
 	podmanArgs = append(podmanArgs, "-d", ALPINE, "ls")
 	session := p.Podman(podmanArgs)
 	session.WaitWithDefaultTimeout()
-	return session, session.ExitCode(), session.OutputToString()
+	if session.ExitCode() != 0 {
+		return session, session.ExitCode(), session.OutputToString()
+	}
+	cid := session.OutputToString()
+
+	wsession := p.Podman([]string{"wait", cid})
+	wsession.WaitWithDefaultTimeout()
+	return session, wsession.ExitCode(), cid
 }
 
 // RunNginxWithHealthCheck runs the alpine nginx container with an optional name and adds a healthcheck into it
@@ -431,7 +438,14 @@ func (p *PodmanTestIntegration) RunLsContainerInPod(name, pod string) (*PodmanSe
 	podmanArgs = append(podmanArgs, "-d", ALPINE, "ls")
 	session := p.Podman(podmanArgs)
 	session.WaitWithDefaultTimeout()
-	return session, session.ExitCode(), session.OutputToString()
+	if session.ExitCode() != 0 {
+		return session, session.ExitCode(), session.OutputToString()
+	}
+	cid := session.OutputToString()
+
+	wsession := p.Podman([]string{"wait", cid})
+	wsession.WaitWithDefaultTimeout()
+	return session, wsession.ExitCode(), cid
 }
 
 // BuildImage uses podman build and buildah to build an image
diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go
index 60136bcc2..f5b70d6bf 100644
--- a/test/e2e/info_test.go
+++ b/test/e2e/info_test.go
@@ -135,4 +135,14 @@ var _ = Describe("Podman Info", func() {
 			Expect(session.OutputToString()).To(ContainSubstring("false"))
 		}
 	})
+
+	It("Podman info must contain cgroupControllers with ReleventControllers", func() {
+		SkipIfRootless("Hard to tell which controllers are going to be enabled for rootless")
+		SkipIfRootlessCgroupsV1("Disable cgroups not supported on cgroupv1 for rootless users")
+		session := podmanTest.Podman([]string{"info", "--format", "{{.Host.CgroupControllers}}"})
+		session.WaitWithDefaultTimeout()
+		Expect(session).To(Exit(0))
+		Expect(session.OutputToString()).To(ContainSubstring("memory"))
+		Expect(session.OutputToString()).To(ContainSubstring("pids"))
+	})
 })
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go
index 6f28d7e19..a7e61932e 100644
--- a/test/e2e/network_test.go
+++ b/test/e2e/network_test.go
@@ -533,7 +533,11 @@ var _ = Describe("Podman network", func() {
 
 		out, err := inspect.jq(".[0].plugins[0].master")
 		Expect(err).To(BeNil())
-		Expect(out).To(Equal("\"lo\""))
+		Expect(out).To(Equal(`"lo"`))
+
+		ipamType, err := inspect.jq(".[0].plugins[0].ipam.type")
+		Expect(err).To(BeNil())
+		Expect(ipamType).To(Equal(`"dhcp"`))
 
 		nc = podmanTest.Podman([]string{"network", "rm", net})
 		nc.WaitWithDefaultTimeout()
@@ -571,13 +575,29 @@ var _ = Describe("Podman network", func() {
 		Expect(err).To(BeNil())
 		Expect(mtu).To(Equal("1500"))
 
+		name, err := inspect.jq(".[0].plugins[0].type")
+		Expect(err).To(BeNil())
+		Expect(name).To(Equal(`"macvlan"`))
+
+		netInt, err := inspect.jq(".[0].plugins[0].master")
+		Expect(err).To(BeNil())
+		Expect(netInt).To(Equal(`"lo"`))
+
+		ipamType, err := inspect.jq(".[0].plugins[0].ipam.type")
+		Expect(err).To(BeNil())
+		Expect(ipamType).To(Equal(`"host-local"`))
+
 		gw, err := inspect.jq(".[0].plugins[0].ipam.ranges[0][0].gateway")
 		Expect(err).To(BeNil())
-		Expect(gw).To(Equal("\"192.168.1.254\""))
+		Expect(gw).To(Equal(`"192.168.1.254"`))
 
 		subnet, err := inspect.jq(".[0].plugins[0].ipam.ranges[0][0].subnet")
 		Expect(err).To(BeNil())
-		Expect(subnet).To(Equal("\"192.168.1.0/24\""))
+		Expect(subnet).To(Equal(`"192.168.1.0/24"`))
+
+		routes, err := inspect.jq(".[0].plugins[0].ipam.routes[0].dst")
+		Expect(err).To(BeNil())
+		Expect(routes).To(Equal(`"0.0.0.0/0"`))
 
 		nc = podmanTest.Podman([]string{"network", "rm", net})
 		nc.WaitWithDefaultTimeout()