summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/e2e/hooks/checkhook.json (renamed from test/hooks/checkhook.json)2
-rwxr-xr-xtest/e2e/hooks/checkhook.sh (renamed from test/hooks/checkhook.sh)0
-rw-r--r--test/e2e/libpod_suite_test.go3
-rw-r--r--test/e2e/run_test.go14
4 files changed, 18 insertions, 1 deletions
diff --git a/test/hooks/checkhook.json b/test/e2e/hooks/checkhook.json
index 50ff23727..5a9bc86d1 100644
--- a/test/hooks/checkhook.json
+++ b/test/e2e/hooks/checkhook.json
@@ -1,5 +1,5 @@
{
"cmd" : [".*"],
- "hook" : "HOOKSDIR/checkhook.sh",
+ "hook" : "/tmp/checkhook.sh",
"stage" : [ "prestart" ]
}
diff --git a/test/hooks/checkhook.sh b/test/e2e/hooks/checkhook.sh
index 8b755cb40..8b755cb40 100755
--- a/test/hooks/checkhook.sh
+++ b/test/e2e/hooks/checkhook.sh
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 5bdc112fb..a902949ba 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -156,6 +156,9 @@ func (p *PodmanTest) MakeOptions() []string {
// Podman is the exec call to podman on the filesystem
func (p *PodmanTest) Podman(args []string) *PodmanSession {
podmanOptions := p.MakeOptions()
+ if os.Getenv("HOOK_OPTION") != "" {
+ podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
+ }
podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
podmanOptions = append(podmanOptions, args...)
fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " "))
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 16fae5898..21c577d9a 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -6,6 +6,7 @@ import (
"os"
"path/filepath"
+ "github.com/mrunalp/fileutils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
@@ -217,6 +218,19 @@ var _ = Describe("Podman run", func() {
Expect(session.ExitCode()).To(Equal(0))
})
+ It("podman test hooks", func() {
+ hcheck := "/run/hookscheck"
+ hooksDir := "/tmp/hooks"
+ os.Mkdir(hooksDir, 0755)
+ fileutils.CopyFile("hooks/hooks.json", hooksDir)
+ os.Setenv("HOOK_OPTION", fmt.Sprintf("--hooks-dir-path=%s", hooksDir))
+ os.Remove(hcheck)
+ session := podmanTest.Podman([]string{"run", ALPINE, "ls"})
+ session.Wait(10)
+ os.Unsetenv("HOOK_OPTION")
+ Expect(session.ExitCode()).To(Equal(0))
+ })
+
It("podman run with secrets", func() {
containersDir := "/usr/share/containers"
err := os.MkdirAll(containersDir, 0755)