From a95b6356010bfb68287d21c186353737dbdfab01 Mon Sep 17 00:00:00 2001 From: Adam Outler Date: Thu, 29 Jan 2026 16:44:43 +0000 Subject: [PATCH 1/2] move docker_tests script to better name/location --- .github/workflows/code-checks.yml | 4 ++-- .github/workflows/run-all-tests.yml | 6 +++--- .../run_tests_in_docker_environment.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename test/docker_tests/run_docker_tests.sh => scripts/run_tests_in_docker_environment.sh (98%) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index e5d5b963..908ce89f 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -95,5 +95,5 @@ jobs: - name: Run Docker-based tests run: | echo "🐳 Running Docker-based tests..." - chmod +x ./test/docker_tests/run_docker_tests.sh - ./test/docker_tests/run_docker_tests.sh + chmod +x ./scripts/run_tests_in_docker_environment.sh + ./scripts/run_tests_in_docker_environment.sh diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index cb17c201..14eca50f 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -61,7 +61,7 @@ jobs: - name: Run Docker Integration Script run: | - chmod +x ./test/docker_tests/run_docker_tests.sh + chmod +x ./scripts/run_tests_in_docker_environment.sh # We update the pytest command to use the specific paths built above. # Note: We still keep your 'not' filter to skip E2E tests unless you want them. @@ -70,9 +70,9 @@ jobs: echo "🚀 Targeted Pytest Command: $SED_COMMAND" - sed -i "s|pytest -m 'not (docker or compose or feature_complete)'|$SED_COMMAND|g" ./test/docker_tests/run_docker_tests.sh + sed -i "s|pytest -m 'not (docker or compose or feature_complete)'|$SED_COMMAND|g" ./scripts/run_tests_in_docker_environment.sh - ./test/docker_tests/run_docker_tests.sh + ./scripts/run_tests_in_docker_environment.sh - name: Cleanup if: always() diff --git a/test/docker_tests/run_docker_tests.sh b/scripts/run_tests_in_docker_environment.sh similarity index 98% rename from test/docker_tests/run_docker_tests.sh rename to scripts/run_tests_in_docker_environment.sh index 0c644a4b..c5038a24 100755 --- a/test/docker_tests/run_docker_tests.sh +++ b/scripts/run_tests_in_docker_environment.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# run_docker_tests.sh +# run_tests_in_docker_environment.sh # # This script automates the entire process of testing the application # within its intended, privileged devcontainer environment. It is From f54ba4817e7f3289e27f4f1c2fc70a36437cfb6b Mon Sep 17 00:00:00 2001 From: Adam Outler Date: Thu, 29 Jan 2026 16:51:32 +0000 Subject: [PATCH 2/2] remove unused script --- .devcontainer/scripts/run-tests.sh | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100755 .devcontainer/scripts/run-tests.sh diff --git a/.devcontainer/scripts/run-tests.sh b/.devcontainer/scripts/run-tests.sh deleted file mode 100755 index 80eaf013..00000000 --- a/.devcontainer/scripts/run-tests.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# shellcheck shell=sh -# Simple helper to run pytest inside the devcontainer with correct paths -set -eu - -# Ensure we run from the workspace root -cd /workspaces/NetAlertX - -# Make sure PYTHONPATH includes server and workspace -export PYTHONPATH="/workspaces/NetAlertX:/workspaces/NetAlertX/server:/app:/app/server:${PYTHONPATH:-}" - -# Default to running the full test suite under /workspaces/NetAlertX/test -pytest -q --maxfail=1 --disable-warnings test "$@"