summaryrefslogtreecommitdiff
path: root/pkg/hooks/read_test.go
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2018-06-03 11:38:46 -0700
committerAtomic Bot <atomic-devel@projectatomic.io>2018-06-04 13:01:56 +0000
commit947e410fe6e731743f2f25df3cf4b79cdcfbbf15 (patch)
tree4816eff0eb056ac15b25f34f350ebc4e5d17696d /pkg/hooks/read_test.go
parentcae49fca2930e461577df77ed303f90c9eed615c (diff)
downloadpodman-947e410fe6e731743f2f25df3cf4b79cdcfbbf15.tar.gz
podman-947e410fe6e731743f2f25df3cf4b79cdcfbbf15.tar.bz2
podman-947e410fe6e731743f2f25df3cf4b79cdcfbbf15.zip
hooks: Fail ReadDir if a configured hook executable is missing
The continue here is from 5676597f (hooks/read: Ignore IsNotExist for JSON files in ReadDir, 2018-04-27, #686), where it was intended to silently ignore missing JSON files. However, the old logic was also silently ignoring not-exist errors from the os.Stat(hook.Hook.Path) from 68eb128f (pkg/hooks: Version the hook structure and add 1.0.0 hooks, 2018-04-27, #686). This commit adjusts the check so JSON not-exist errors continue to be silently ignored while hook executable not-exist errors become fatal. Signed-off-by: W. Trevor King <wking@tremily.us> Closes: #887 Approved by: rhatdan
Diffstat (limited to 'pkg/hooks/read_test.go')
-rw-r--r--pkg/hooks/read_test.go21
1 files changed, 21 insertions, 0 deletions
diff --git a/pkg/hooks/read_test.go b/pkg/hooks/read_test.go
index 69e7aff44..811cace23 100644
--- a/pkg/hooks/read_test.go
+++ b/pkg/hooks/read_test.go
@@ -191,3 +191,24 @@ func TestBadDir(t *testing.T) {
}
assert.Regexp(t, "^parsing hook \"[^\"]*a.json\": unrecognized hook version: \"-1\"$", err.Error())
}
+
+func TestHookExecutableDoesNotExit(t *testing.T) {
+ dir, err := ioutil.TempDir("", "hooks-test-")
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer os.RemoveAll(dir)
+
+ jsonPath := filepath.Join(dir, "hook.json")
+ err = ioutil.WriteFile(jsonPath, []byte("{\"version\": \"1.0.0\", \"hook\": {\"path\": \"/does/not/exist\"}, \"when\": {\"always\": true}, \"stages\": [\"prestart\"]}"), 0644)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ hooks := map[string]*current.Hook{}
+ err = ReadDir(dir, []string{}, hooks)
+ if err == nil {
+ t.Fatal("unexpected success")
+ }
+ assert.Regexp(t, "^stat /does/not/exist: no such file or directory$", err.Error())
+}