From 730fbc76284fd14749863ee160e6548577e7b180 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 30 Apr 2020 08:39:12 -0400 Subject: Properly handle containers.conf devices We need to add the default devices listed in containers.conf Signed-off-by: Daniel J Walsh --- test/e2e/config/containers.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/e2e/config/containers.conf b/test/e2e/config/containers.conf index 55d18f5e8..a3bdde786 100644 --- a/test/e2e/config/containers.conf +++ b/test/e2e/config/containers.conf @@ -38,7 +38,7 @@ shm_size = "201k" # If it is empty or commented out, only the default devices will be used # devices = [ - "/dev/zero:/dev/notone,rwm", + "/dev/zero:/dev/notone:rwm", ] default_sysctls = [ -- cgit v1.2.3-54-g00ecf From 1218d70915cd4f3edb3c595101626e7924cbe1c6 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 30 Apr 2020 08:40:43 -0400 Subject: Remove skip on containers.conf tests Signed-off-by: Daniel J Walsh --- test/e2e/containers_conf_test.go | 1 - 1 file changed, 1 deletion(-) (limited to 'test') diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index b984a35f3..a2ef7eb4a 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -23,7 +23,6 @@ var _ = Describe("Podman run", func() { ) BeforeEach(func() { - Skip(v2fail) tempdir, err = CreateTempDirInTempDir() if err != nil { os.Exit(1) -- cgit v1.2.3-54-g00ecf