diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-04 11:08:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 11:08:43 +0200 |
| commit | 51d0be42046f691e81cddfe2712baa14cecbdfbe (patch) | |
| tree | 31a4708b600b60a5a9c5529637721f1a5d88e195 /test/e2e | |
| parent | 7b941462d42aa76b134462ff92a6823359d2cf76 (diff) | |
| parent | 7d37f4bbfee8def704cf38ec74f91e3e0db61723 (diff) | |
| download | podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.tar.gz podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.tar.bz2 podman-51d0be42046f691e81cddfe2712baa14cecbdfbe.zip | |
Merge pull request #6051 from rhatdan/containers.conf
Fixes for test/e2e/containers_conf_test.go
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/config/containers.conf | 2 | ||||
| -rw-r--r-- | test/e2e/containers_conf_test.go | 1 |
2 files changed, 1 insertions, 2 deletions
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 = [ 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) |