Make more hook tests pass

Author: yuvipanda

images/docker-stacks-foundation/run-hooks.py

@@ -86,9 +86,11 @@ def source(path: PosixPath):
 
 if not hooks_directory.exists():
     print(f"Directory {hooks_directory} does not exist")
+    sys.exit(1)
 
 if not hooks_directory.is_dir():
     print(f"{hooks_directory} is not a directory")
+    sys.exit(1)
 
 print(f"Running hooks in: {hooks_directory} as {os.getuid()} gid: {os.getgid()}")
 
@@ -104,9 +106,7 @@ def source(path: PosixPath):
                 f"{f} has failed with return code {run.returncode}, continuing execution"
             )
     else:
-        print(f"Ignoring non-executable file {f}")
+        print(f"Ignoring non-executable: {f}")
 
 
 print(f"Done running hooks in: {hooks_directory}")
-
-print(os.environ['HELLO'])

tests/docker-stacks-foundation/test_run_hooks.py

@@ -44,7 +44,7 @@ def test_run_hooks_missing_dir(container: TrackedContainer) -> None:
             "source /usr/local/bin/run-hooks.sh /tmp/missing-dir/",
         ],
     )
-    assert "Directory /tmp/missing-dir/ doesn't exist or is not a directory" in logs
+    assert "Directory /tmp/missing-dir does not exist" in logs
 
 
 def test_run_hooks_dir_is_file(container: TrackedContainer) -> None:
@@ -58,7 +58,7 @@ def test_run_hooks_dir_is_file(container: TrackedContainer) -> None:
             "touch /tmp/some-file && source /usr/local/bin/run-hooks.sh /tmp/some-file",
         ],
     )
-    assert "Directory /tmp/some-file doesn't exist or is not a directory" in logs
+    assert "/tmp/some-file is not a directory" in logs
 
 
 def test_run_hooks_empty_dir(container: TrackedContainer) -> None:
@@ -91,7 +91,7 @@ def test_run_hooks_with_files(container: TrackedContainer) -> None:
         command=["bash", "-c", command],
     )
     assert "Executable python file was successfully" in logs
-    assert "Ignoring non-executable: /home/jovyan/data-copy//non_executable.py" in logs
+    assert "Ignoring non-executable: /home/jovyan/data-copy/non_executable.py" in logs
     assert "SOME_VAR is 123" in logs