Once again, restore an AI's regression mess.

Author: wenaus

install.sh

@@ -15,9 +15,10 @@ if [[ ! -f "pyproject.toml" ]] || [[ ! -d "src/swf_testbed_cli" ]]; then
 fi
 
 # Check for required sibling directories
-PARENT_DIR=$(dirname "$(pwd)")
-SWF_COMMON_LIB="$PARENT_DIR/swf-common-lib"
-SWF_MONITOR="$PARENT_DIR/swf-monitor"
+SWF_PARENT_DIR=$(dirname "$(pwd)")
+export SWF_PARENT_DIR
+SWF_COMMON_LIB="$SWF_PARENT_DIR/swf-common-lib"
+SWF_MONITOR="$SWF_PARENT_DIR/swf-monitor"
 
 echo "📁 Checking for required repositories..."
 if [[ ! -d "$SWF_COMMON_LIB" ]]; then

run_all_tests.sh

@@ -7,9 +7,9 @@ printf "\n%100s\n\n" | tr ' ' '*'
 # Get the directory of the script
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
-# Use PARENT_DIR if set by install.sh, otherwise exit with error
-if [[ -z "$PARENT_DIR" ]]; then
-    echo "❌ Error: PARENT_DIR not set"
+# Use SWF_PARENT_DIR if set by install.sh, otherwise exit with error
+if [[ -z "$SWF_PARENT_DIR" ]]; then
+    echo "❌ Error: SWF_PARENT_DIR not set"
     echo "   Please run install.sh from swf-testbed directory first"
     exit 1
 fi
@@ -18,10 +18,10 @@ fi
 REPOS=()
 while IFS= read -r -d '' dir; do
     REPOS+=("$(basename "$dir")")
-done < <(find "$PARENT_DIR" -maxdepth 1 -type d -name 'swf-*' -print0 | sort -z)
+done < <(find "$SWF_PARENT_DIR" -maxdepth 1 -type d -name 'swf-*' -print0 | sort -z)
 
 for repo in "${REPOS[@]}"; do
-    REPO_PATH="$PARENT_DIR/$repo"
+    REPO_PATH="$SWF_PARENT_DIR/$repo"
     TEST_SCRIPT="$REPO_PATH/run_tests.sh"
     echo "--- Running tests for $repo ---"
     if [ -x "$TEST_SCRIPT" ]; then

run_tests.sh

@@ -6,34 +6,17 @@ printf "\n%100s\n\n" | tr ' ' '*'
 
 # Get the directory of the script
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-VENV_DIR="$SCRIPT_DIR/.venv"
-REQS_TXT="$SCRIPT_DIR/requirements.txt"
-PYPROJECT="$SCRIPT_DIR/pyproject.toml"
 
-# If a virtual environment is already active, use it
-if [ -n "$VIRTUAL_ENV" ]; then
-    echo "Using already active Python environment: $VIRTUAL_ENV"
-# Otherwise, try to activate the local venv if it exists
-elif [ -d "$VENV_DIR" ]; then
-    echo "Activating Python environment from $VENV_DIR"
-    source "$VENV_DIR/bin/activate"
-# If no environment is active and no venv exists, create a new venv
-else
-    echo "No active Python environment found. Creating venv at $VENV_DIR."
-    python3 -m venv "$VENV_DIR"
-    source "$VENV_DIR/bin/activate"
-    # Install dependencies if requirements.txt or pyproject.toml is present
-    if [ -f "$REQS_TXT" ]; then
-        echo "Installing dependencies from requirements.txt..."
-        pip install -r "$REQS_TXT"
-    elif [ -f "$PYPROJECT" ]; then
-        echo "Installing dependencies from pyproject.toml..."
-        pip install .[test]
-    else
-        echo "No requirements.txt or pyproject.toml found. Skipping dependency install."
-    fi
+# Check if a virtual environment is active
+if [ -z "$VIRTUAL_ENV" ]; then
+    echo "❌ Error: No Python virtual environment is active"
+    echo "   Please activate the swf-testbed virtual environment first:"
+    echo "   cd swf-testbed && source .venv/bin/activate"
+    exit 1
 fi
 
+echo "Using Python environment: $VIRTUAL_ENV"
+
 # Run tests if the tests directory exists and is not empty
 if [ -d "$SCRIPT_DIR/tests" ] && [ "$(ls -A "$SCRIPT_DIR/tests" 2>/dev/null)" ]; then
     echo "Running pytest for swf-testbed..."