Amended jobout path. #66

Author: Hatim Chahout

tests/run_test_setup.bash

@@ -18,7 +18,7 @@ function setup_test_env() {
 
   # Create an empty param.bash and add the mock paths to it
   > "param.bash"
-  cp run_proc.bash "$TMP_DIR/run_proc.bash"
+  # cp run_proc.bash "$TMP_DIR/run_proc.bash"
   echo "export MARINE_VAL=$TMP_DIR" >> "param.bash"
   echo "export MSKPATH=$TMP_DIR/MESH_MASK_DIR" >> "param.bash"
   echo "export CDFPATH=$TMP_DIR/CDFTOOLS_DIR/bin" >> "param.bash"

tests/test_valid_run.bash

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 echo "--- Test 1: A valid run ---"
 
@@ -9,25 +9,27 @@ source ./tests/run_test_setup.bash
 echo "Setting up test environment..."
 setup_test_env
 
-echo "Changing to temporary directory..."
-cd "$TMP_DIR"
+# echo "Changing to temporary directory..."
+# cd "$TMP_DIR"
+
+JOBOUT="$TMP_DIR/test_valid_run_out.txt"
 
 echo "Running the process with valid parameters..."
-source ./run_proc.bash -B bathy.nc -C 1 mesh_mask.nc 2020 2020 1m RUNID_TEST > output.txt 2>&1
+source ./run_proc.bash -B bathy.nc -C 1 mesh_mask.nc 2020 2020 1m RUNID_TEST > "$JOBOUT" 2>&1
 
-if ! grep -q "MOCK SBATCH: --output=.*mk_msks.out /.*/mk_msks.bash" output.txt; then
+if ! grep -q "MOCK SBATCH: --output=.*mk_msks.out /.*/mk_msks.bash" "$JOBOUT"; then
   echo "Test failed: Expected 'mk_msks.bash' job was not submitted."
   cleanup_test_env
   exit 1
 fi
 
-if ! grep -q "MOCK SBATCH: --job-name=moo_1m_grid-._20200101 --output=.*moo_1m_grid-._20200101.out /.*/get_data.bash" output.txt; then
+if ! grep -q "MOCK SBATCH: --job-name=moo_1m_grid-._20200101 --output=.*moo_1m_grid-._20200101.out /.*/get_data.bash" "$JOBOUT"; then
   echo "Test failed: Expected a data retrieval job to be submitted."
   cleanup_test_env
   exit 1
 fi
 
-if ! grep -q "data processing is done for RUNID_TEST between 2020 and 2020" output.txt; then
+if ! grep -q "data processing is done for RUNID_TEST between 2020 and 2020" "$JOBOUT"; then
   echo "Test failed: Expected success message not found."
   cleanup_test_env
   exit 1