diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-15 03:52:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-15 03:52:39 -0700 |
| commit | 3639ac1ad009ad9579e27cb15ff9095c5c92eb76 (patch) | |
| tree | 3dc54ec0ab640c5cd2aa8a6c1a20e0f34cf2fbc4 | |
| parent | 2c4f3d6dad524ce9886b044ea7a22df05043264c (diff) | |
| parent | 83f79dbacc3eb6eb655960281cf28cf90842759b (diff) | |
| download | podman-3639ac1ad009ad9579e27cb15ff9095c5c92eb76.tar.gz podman-3639ac1ad009ad9579e27cb15ff9095c5c92eb76.tar.bz2 podman-3639ac1ad009ad9579e27cb15ff9095c5c92eb76.zip | |
Merge pull request #1631 from giuseppe/papr-drop-double-process
papr_prepare: remove double process for starting up .papr.sh
| -rw-r--r-- | .papr_prepare.sh | 2 | ||||
| -rwxr-xr-x | contrib/python/podman/test/test_runner.sh | 1 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/.papr_prepare.sh b/.papr_prepare.sh index 0f06af00d..e0657dcd2 100644 --- a/.papr_prepare.sh +++ b/.papr_prepare.sh @@ -14,4 +14,4 @@ fi ${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} . 2>build.log # Run the tests -${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/containers/libpod --workdir /go/src/github.com/containers/libpod -e CGROUP_MANAGER=cgroupfs -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/containers/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/podman/conmon" -e DIST=$DIST -e CONTAINER_RUNTIME=$CONTAINER_RUNTIME $IMAGE bash -c sh ./.papr.sh -b -i -t +${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/containers/libpod:Z --workdir /go/src/github.com/containers/libpod -e CGROUP_MANAGER=cgroupfs -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/containers/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/podman/conmon" -e DIST=$DIST -e CONTAINER_RUNTIME=$CONTAINER_RUNTIME $IMAGE sh ./.papr.sh -b -i -t diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh index 1b7e0a85e..65cbd1e9c 100755 --- a/contrib/python/podman/test/test_runner.sh +++ b/contrib/python/podman/test/test_runner.sh @@ -27,6 +27,7 @@ done shift $((OPTIND -1)) function cleanup { + set +xeuo pipefail # aggressive cleanup as tests may crash leaving crap around umount '^(shm|nsfs)' umount '\/run\/netns' diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 271651056..052dd0566 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -218,7 +218,11 @@ var _ = Describe("Podman run", func() { session = podmanTest.Podman([]string{"run", "--rm", "--mount", fmt.Sprintf("type=bind,src=%s,target=/run/test,shared", mountPath), ALPINE, "grep", "/run/test", "/proc/self/mountinfo"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - Expect(session.OutputToString()).To(ContainSubstring("/run/test rw,relatime shared")) + found, matches := session.GrepString("/run/test") + Expect(found).Should(BeTrue()) + Expect(matches[0]).To(ContainSubstring("rw")) + Expect(matches[0]).To(ContainSubstring("relatime")) + Expect(matches[0]).To(ContainSubstring("shared")) mountPath = filepath.Join(podmanTest.TempDir, "scratchpad") os.Mkdir(mountPath, 0755) |