Updated conformance tests scripts.

Author: dusano

test_scripts/run_conformance_tests_cypress.sh

@@ -2,6 +2,22 @@
 
 NPM_INSTALL_OUTPUT_FILTER="up to date in|added [0-9]* packages, removed [0-9]* packages, and changed [0-9]* packages in|removed [0-9]* packages, and changed [0-9]* packages in|added [0-9]* packages in|removed [0-9]* packages in"
 
+# Function to check and kill any Node process running on port 3000 (React development server)
+check_and_kill_node_server() {
+    # Find process listening on port 3000
+    local pid=$(lsof -i :3000 -t 2>/dev/null)
+    if [ ! -z "$pid" ]; then
+        if ps -p $pid -o comm= | grep -q "node"; then
+            printf "Found Node server running on port 3000. Killing it...\n"
+            kill $pid 2>/dev/null
+            sleep 1  # Give the process time to terminate
+            if [ "${VERBOSE:-}" -eq 1 ] 2>/dev/null; then
+                printf "Node server terminated.\n"
+            fi
+        fi
+    fi
+}
+
 # Function to get all child processes of a given PID and store them in a list
 get_children() {
     local parent_pid=$1
@@ -16,6 +32,43 @@ get_children() {
     done
 }
 
+# Cleanup function to ensure all processes are terminated
+cleanup() {
+    # Kill any running npm processes started by this script
+    if [ ! -z "${NPM_PID+x}" ]; then
+        pkill -P $NPM_PID 2>/dev/null
+        kill $NPM_PID 2>/dev/null
+    fi
+
+    # Kill React app and its children if they exist
+    if [ ! -z "${REACT_APP_PID+x}" ]; then
+        local processes_to_kill=()
+        get_children $REACT_APP_PID
+        
+        # Kill the main process
+        kill $REACT_APP_PID 2>/dev/null
+
+        # Kill all the subprocesses
+        for pid in "${processes_to_kill[@]}"
+        do
+            kill $pid 2>/dev/null
+        done
+
+        if [ "${VERBOSE:-}" -eq 1 ] 2>/dev/null; then
+            printf "React app is terminated!\n"
+        fi
+    fi
+
+    # Remove temporary files if they exist
+    [ -f "$build_output" ] && rm "$build_output" 2>/dev/null
+}
+
+# Set up trap to call cleanup function on script exit, interrupt, or termination
+trap cleanup EXIT SIGINT SIGTERM
+
+# Check for and kill any existing Node server from previous runs
+check_and_kill_node_server
+
 # Check if build folder name is provided
 if [ -z "$1" ]; then
   printf "Error: No build folder name provided.\n"
@@ -109,6 +162,7 @@ BROWSER=none npm start -- --no-open > app.log 2>&1 &
 
 # Capture the process ID of the npm start command
 REACT_APP_PID=$!
+NPM_PID=$(pgrep -P $REACT_APP_PID npm)
 
 # Wait for the "compiled successfully!" message in the log file
 while true; do
@@ -168,28 +222,9 @@ if [ "${VERBOSE:-}" -eq 1 ] 2>/dev/null; then
   printf "Running Cypress conformance tests...\n"
 fi
 
-BROWSERSLIST_IGNORE_OLD_DATA=1 npx cypress run --config video=false 2>/dev/null
+BROWSERSLIST_IGNORE_OLD_DATA=1 npx cypress run --browser=chrome --config video=false 2>/dev/null
 cypress_run_result=$?
 
-# Initialize an empty array to hold the PIDs
-processes_to_kill=()
-
-# Start the recursive search from the given parent PID
-get_children $REACT_APP_PID
-
-# Kill the main process
-kill $REACT_APP_PID
-
-# Kill all the subprocesses
-for pid in "${processes_to_kill[@]}"
-do
-    kill $pid
-done
-
-if [ "${VERBOSE:-}" -eq 1 ] 2>/dev/null; then
-  printf "React app is terminated!\n"
-fi
-
 if [ $cypress_run_result -ne 0 ]; then
   if [ "${VERBOSE:-}" -eq 1 ] 2>/dev/null; then
     printf "Error: Cypress conformance tests have failed.\n"

test_scripts/run_conformance_tests_golang.sh

@@ -24,7 +24,7 @@ fi
 
 # Check if the go build subfolder exists
 if [ -d "$GO_BUILD_SUBFOLDER" ]; then
-  # Find and delete all files and folders except "node_modules", "build", and "package-lock.json"
+  # Find and delete all files and folders
   find "$GO_BUILD_SUBFOLDER" -mindepth 1 -exec rm -rf {} +
 
   if [ "${VERBOSE:-}" -eq 1 ] 2>/dev/null; then
@@ -48,22 +48,31 @@ if [ $? -ne 0 ]; then
   exit 2
 fi
 
-# Execute all Go lang conformance tests in the build folder
-printf "Compiling Golang conformance tests...\n\n"
+echo "Runinng go get in the build folder..."
+go get
 
-output=$(go test -c $current_dir/$2/conformance_test.go 2>&1)
-exit_code=$?
+cd "$current_dir/$2" 2>/dev/null
 
-# If there was an error, print the output and exit with the error code
-if [ $exit_code -ne 0 ]; then
-    echo "$output"
-    exit $exit_code
+if [ $? -ne 0 ]; then
+  printf "Error: Conformance tests folder '$current_dir/$2' does not exist.\n"
+  exit 2
 fi
 
-# Execute all Go lang conformance tests in the build folder
+echo "Checking for go.mod in conformance test directory..."
+if [ -f "go.mod" ]; then
+    echo "Running go get in conformance test directory..."
+    go get
+else
+    echo "No go.mod found in conformance test directory, skipping go get"
+fi
+
+# Move back to build directory
+cd "$current_dir/$GO_BUILD_SUBFOLDER" 2>/dev/null
+
+# Execute Go lang conformance tests
 printf "Running Golang conformance tests...\n\n"
 
-output=$(./main.test 2>&1)
+output=$(go run $current_dir/$2/conformance_tests.go 2>&1)
 exit_code=$?
 
 # If there was an error, print the output and exit with the error code