From d6e77e13fd1926085c022189e648b6c05ea19b70 Mon Sep 17 00:00:00 2001 From: James Tanner Date: Thu, 23 May 2024 11:22:16 -0400 Subject: [PATCH] Skip tests unless enabled. No-Issue Signed-off-by: James Tanner --- galaxy_ng/tests/integration/dab/test_url_resolution.py | 7 ++++++- profiles/dab_jwt/run_integration.sh | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/galaxy_ng/tests/integration/dab/test_url_resolution.py b/galaxy_ng/tests/integration/dab/test_url_resolution.py index 1c80a75301..b7c865a83f 100644 --- a/galaxy_ng/tests/integration/dab/test_url_resolution.py +++ b/galaxy_ng/tests/integration/dab/test_url_resolution.py @@ -1,4 +1,9 @@ -def test_dab_collection_download_url_hostnames(galaxy_client, published): +import os +import pytest + + +@pytest.mark.skipif(not os.getenv("ENABLE_DAB_TESTS"), reason="Skipping test because ENABLE_DAB_TESTS is not set") +def test_dab_collection_download_url_hostnames(settings, galaxy_client, published): """ We want the download url to point at the gateway """ diff --git a/profiles/dab_jwt/run_integration.sh b/profiles/dab_jwt/run_integration.sh index e0eee7c2dd..7c848b652d 100644 --- a/profiles/dab_jwt/run_integration.sh +++ b/profiles/dab_jwt/run_integration.sh @@ -19,8 +19,9 @@ set -x export HUB_API_ROOT=http://jwtproxy:8080/api/galaxy/ export HUB_ADMIN_PASS=admin export HUB_USE_MOVE_ENDPOINT=0 +export ENABLE_DAB_TESTS=1 -$VENVPATH/bin/pytest -v -r sx --color=yes -m "$HUB_TEST_MARKS" "$@" galaxy_ng/tests/integration/dab +$VENVPATH/bin/pytest -v -r sx --color=yes "$@" galaxy_ng/tests/integration/dab RC=$? exit $RC