Skip to content

Tidy test scripts #1471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jokob-sk merged 2 commits into from
Jan 29, 2026
Merged

Tidy test scripts #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a95b635
move docker_tests script to better name/location
adamoutler Jan 29, 2026
f54ba48
remove unused script
adamoutler Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .devcontainer/scripts/run-tests.sh
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/code-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/run-all-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion test/docker_tests/run_docker_tests.sh → scripts/run_tests_in_docker_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down