fix: mockoon script failing silently

.github/workflows/mockoon-tests.yml

@@ -7,6 +7,7 @@ on:
       - '!mocks/README.md'
       - '.github/workflows/mockoon-tests.yml'
       - 'Makefile'
+      - 'scripts/run-mockoon-tests'
 
   pull_request:
     paths:
@@ -15,6 +16,7 @@ on:
       - '!mocks/README.md'
       - '.github/workflows/mockoon-tests.yml'
       - 'Makefile'
+      - 'scripts/run-mockoon-tests'
 
 jobs:
   integration-test:

scripts/run-mockoon-tests

@@ -23,10 +23,10 @@
 # be available or won't start.
 #
 # After this script runs created instance of mockoon container is
-# removed from the system. 
+# removed from the system.
 
 CONTAINER_ENGINE="podman"
-MOCKOON_CONTAINER="mockoon/cli:1.5.1"
+MOCKOON_CONTAINER="docker.io/mockoon/cli:2.2.1"
 MOCKOON_PORT="3000"
 MOCKOON_TIMEOUT=30
 
@@ -37,17 +37,17 @@ MOCK_JSON="${MOCK_JSON-"${SCRIPT_DIR}/../mocks/commitexporter_github.json"}"
 
 if ! command -v "pytest" &> /dev/null
 then
-      echo "No pytest found in the PATH"
-      exit 2
+    echo "No pytest found in the PATH"
+    exit 2
 fi
 
 if ! command -v "${CONTAINER_ENGINE}" &> /dev/null
 then
     CONTAINER_ENGINE="docker"
     if ! command -v "${CONTAINER_ENGINE}" &> /dev/null
     then
-      echo "No podman or docker found in the PATH"
-      exit 2
+        echo "No podman or docker found in the PATH"
+        exit 2
     fi
 fi
 
@@ -64,18 +64,16 @@ function cleanup_and_exit() {
     echo "Exiting..."
     cleanup_mockoon_pod
     # Propagate exit value if was provided
-    [ -n "${exit_val}" ] && exit "$exit_val"    
+    [ -n "${exit_val}" ] && echo "Exit code: ${exit_val}" && exit "$exit_val"
     exit 0
 }
 
-trap 'cleanup_and_exit' INT TERM EXIT
+trap 'cleanup_and_exit $?' INT TERM EXIT
 
 # Check if test container already exists, if yes remove it
-
 cleanup_mockoon_pod
 
-# We need to check if port 3000 is used by other process
-
+# We need to check if port MOCKOON_PORT is used by other process
 if lsof -Pi :"${MOCKOON_PORT}" -sTCP:LISTEN -t >/dev/null ; then
     echo "Can not run integration tests as other process uses port ${MOCKOON_PORT}"
     exit 2
@@ -89,24 +87,20 @@ if [ "${RUNNING_ID}" == "" ]; then
     echo "Mockoon is not working as expected."
     echo "Logs from failing container:"
     ${CONTAINER_ENGINE} logs "${RUNNING_ID}"
+    exit 1
 fi
 
 counter=1
-until curl -k https://localhost:3000/version
+until curl -k https://localhost:"${MOCKOON_PORT}"/version
 do
     if [ $counter -gt $MOCKOON_TIMEOUT ]; then
         echo "Timed out waiting for the mockoon service"
-        cleanup_and_exit
+        exit 1
     fi
     echo "Trying to reach mockoon: $counter out of $MOCKOON_TIMEOUT"
     sleep 1
     counter=$((counter+1))
 done
 
-# Remove exit trap, so we can propagate exit value from pytest
-trap - EXIT
-
 # Run mockoon tests
 pytest -rap -m mockoon
-pytest_exit=$?
-cleanup_and_exit $pytest_exit