diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-08 21:16:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-08 21:16:04 +0200 |
| commit | 8d37c2073f774d7f7e708cdb8c24f07c87e83587 (patch) | |
| tree | cec947360ec713e9523404e813256379975c3263 /test/e2e/run_signal_test.go | |
| parent | edc7f52c9577a22f7dcd5b98fbd0125fb8d2da79 (diff) | |
| parent | c187da23c49876f23a5b2fc0f4d94bedd44482e6 (diff) | |
| download | podman-8d37c2073f774d7f7e708cdb8c24f07c87e83587.tar.gz podman-8d37c2073f774d7f7e708cdb8c24f07c87e83587.tar.bz2 podman-8d37c2073f774d7f7e708cdb8c24f07c87e83587.zip | |
Merge pull request #3515 from baude/rootlessintegrationtests
speed up rootless tests
Diffstat (limited to 'test/e2e/run_signal_test.go')
| -rw-r--r-- | test/e2e/run_signal_test.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index 3a5ed483c..1dbac1dc9 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -11,6 +11,7 @@ import ( "syscall" "time" + "github.com/containers/libpod/pkg/rootless" . "github.com/containers/libpod/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -53,7 +54,9 @@ var _ = Describe("Podman run with --sig-proxy", func() { os.Mkdir(udsDir, 0700) udsPath := filepath.Join(udsDir, "fifo") syscall.Mkfifo(udsPath, 0600) - + if rootless.IsRootless() { + podmanTest.RestoreArtifact(fedoraMinimal) + } _, pid := podmanTest.PodmanPID([]string{"run", "-it", "-v", fmt.Sprintf("%s:/h:Z", udsDir), fedoraMinimal, "bash", "-c", sigCatch}) uds, _ := os.OpenFile(udsPath, os.O_RDONLY|syscall.O_NONBLOCK, 0600) @@ -108,6 +111,9 @@ var _ = Describe("Podman run with --sig-proxy", func() { Specify("signals are not forwarded to container with sig-proxy false", func() { signal := syscall.SIGPOLL + if rootless.IsRootless() { + podmanTest.RestoreArtifact(fedoraMinimal) + } session, pid := podmanTest.PodmanPID([]string{"run", "--name", "test2", "--sig-proxy=false", fedoraMinimal, "bash", "-c", sigCatch}) ok := WaitForContainer(podmanTest) |