Polish PMIx test

Author: gwangmu

tests/test_helper/scontrol-mock tests/assets/scontrol-mocktests/test_helper/scontrol-mock renamed to tests/assets/scontrol-mock

@@ -2,19 +2,25 @@ setup() {
   # Create temporary directories
   TMP_HOOKS_DIR=$(mktemp -d)
   TMP_HOOK_LOG_DIR="$(mktemp -d)"
+
+  # Print hook stdout/stderr
   HOOK_OUT="${TMP_HOOK_LOG_DIR}/out.log"
   HOOK_ERR="${TMP_HOOK_LOG_DIR}/err.log"
 
+  touch "${HOOK_OUT}" "${HOOK_ERR}"
+  tail -fn +1 "${HOOK_OUT}" &
+  HOOK_OUT_PID=$!
+  tail -fn +1 "${HOOK_ERR}" &
+  HOOK_ERR_PID=$!
+
   # Prepare mock 'scontrol'
   TMP_BIN_DIR=$(mktemp -d)
-  cp ${BATS_TEST_DIRNAME}/test_helper/scontrol-mock ${TMP_BIN_DIR}/scontrol
+  cp ${BATS_TEST_DIRNAME}/assets/scontrol-mock ${TMP_BIN_DIR}/scontrol
 
-  # Prepare mock PMIx directories.
+  # Prepare mock PMIx directories
   SLURM_JOB_UID=0
   SLURM_JOB_ID=1
   SLURM_STEP_ID=2
-  SPMIX_APPDIR_UID_DIR=/tmp/spmix_appdir_${SLURM_JOB_UID}_${SLURM_JOB_ID}.${SLURM_STEP_ID}
-  SPMIX_APPDIR_NO_UID_DIR=/tmp/spmix_appdir_${SLURM_JOB_ID}.${SLURM_STEP_ID}
   PMIX_DIR=/tmp/spool/slurmd/pmix.${SLURM_JOB_ID}.${SLURM_STEP_ID}
   mkdir -p ${PMIX_DIR}
 
@@ -36,53 +42,54 @@ setup() {
   "stages": ["createContainer"]
 }
 EOF
-
-  # For local tests,
-  #"path": "/home/gwangmu/Projects/sarus/sarus-hooks/build/src/pmix/pmix_hook"
 }
 
 teardown() {
+  kill "${HOOK_OUT_PID}" "${HOOK_ERR_PID}"
   rm -rf "${TMP_HOOKS_DIR}" "${TMP_HOOK_LOG_DIR}" "${TMP_BIN_DIR}" "${PMIX_DIR}"
 }
 
+@test "pmix_hook binds directory (nofail spmix_appdir)" {
+  SPMIX_APPDIR_UID_DIR=/tmp/spmix_appdir_${SLURM_JOB_UID}_${SLURM_JOB_ID}.${SLURM_STEP_ID}
+  rm -rf ${SPMIX_APPDIR_UID_DIR} || true
+  export SLURM_JOB_UID=${SLURM_JOB_UID}
+
+  podman --runtime=crun \
+    --hooks-dir "${TMP_HOOKS_DIR}" \
+    run --rm \
+      --annotation run.oci.hooks.stdout="${HOOK_OUT}" \
+      --annotation run.oci.hooks.stderr="${HOOK_ERR}" \
+      alpine sh -c "[ -d ${PMIX_DIR} ] || ! echo \"error: no pmix dir\""
+}
+
 @test "pmix_hook binds directory (with SLURM_JOB_UID)" {
+  SPMIX_APPDIR_UID_DIR=/tmp/spmix_appdir_${SLURM_JOB_UID}_${SLURM_JOB_ID}.${SLURM_STEP_ID}
   mkdir -p ${SPMIX_APPDIR_UID_DIR}
   export SLURM_JOB_UID=${SLURM_JOB_UID}
 
-  podman --hooks-dir "${TMP_HOOKS_DIR}" run --rm \
-    alpine sh -c "[ -d ${SPMIX_APPDIR_DIR} ] && [ -d ${PMIX_DIR} ]"
-
-  # For hook logs
-  # podman --runtime=crun \
-  #   --hooks-dir "${TMP_HOOKS_DIR}" \
-  #   run --rm \
-  #     --annotation com.hooks.logging.level=0 \
-  #     --annotation run.oci.hooks.stdout="${HOOK_OUT}" \
-  #     --annotation run.oci.hooks.stderr="${HOOK_ERR}" \
-  #     alpine sh -c "[ -d ${SPMIX_APPDIR_DIR} ] && [ -d ${PMIX_DIR} ]" || true
-  # cat ${HOOK_OUT}
-  # cat ${HOOK_ERR}
+  podman --runtime=crun \
+    --hooks-dir "${TMP_HOOKS_DIR}" \
+    run --rm \
+      --annotation run.oci.hooks.stdout="${HOOK_OUT}" \
+      --annotation run.oci.hooks.stderr="${HOOK_ERR}" \
+      alpine sh -c "([ -d ${SPMIX_APPDIR_UID_DIR} ] || ! echo \"error: no spmix_appdir\") && \
+            ([ -d ${PMIX_DIR} ] || ! echo \"error: no pmix dir\")"
 
   rm -rf ${SPMIX_APPDIR_UID_DIR}
 }
 
 @test "pmix_hook binds directory (no SLURM_JOB_UID)" {
+  SPMIX_APPDIR_NO_UID_DIR=/tmp/spmix_appdir_${SLURM_JOB_ID}.${SLURM_STEP_ID}
   mkdir -p ${SPMIX_APPDIR_NO_UID_DIR}
   unset SLURM_JOB_UID
 
-  podman --hooks-dir "${TMP_HOOKS_DIR}" run --rm \
-    alpine sh -c "[ -d ${SPMIX_APPDIR_DIR} ] && [ -d ${PMIX_DIR} ]"
-
-  # For hook logs
-  # podman --runtime=crun \
-  #   --hooks-dir "${TMP_HOOKS_DIR}" \
-  #   run --rm \
-  #     --annotation com.hooks.logging.level=0 \
-  #     --annotation run.oci.hooks.stdout="${HOOK_OUT}" \
-  #     --annotation run.oci.hooks.stderr="${HOOK_ERR}" \
-  #     alpine sh -c "[ -d ${SPMIX_APPDIR_DIR} ] && [ -d ${PMIX_DIR} ]" || true
-  # cat ${HOOK_OUT}
-  # cat ${HOOK_ERR}
+  podman --runtime=crun \
+    --hooks-dir "${TMP_HOOKS_DIR}" \
+    run --rm \
+      --annotation run.oci.hooks.stdout="${HOOK_OUT}" \
+      --annotation run.oci.hooks.stderr="${HOOK_ERR}" \
+      alpine sh -c "([ -d ${SPMIX_APPDIR_NO_UID_DIR} ] || ! echo \"error: no spmix_appdir\") && \
+            ([ -d ${PMIX_DIR} ] || ! echo \"error: no pmix dir\")"
 
   rm -rf ${SPMIX_APPDIR_NO_UID_DIR}
 }