From 52bd3ad9660250f3ffc8f5f3b3bd22b44c5b9614 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 21 Apr 2020 13:09:38 -0400 Subject: [PATCH] Return to skipping Kubernetes staging tests on Github actions... ... still working out some kind of issue with these. --- lib/galaxy_test/driver/integration_util.py | 7 +++++++ test/integration/test_interactivetools_api.py | 1 + test/integration/test_kubernetes_staging.py | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/galaxy_test/driver/integration_util.py b/lib/galaxy_test/driver/integration_util.py index e2da2defbd6..caf05cf8a74 100644 --- a/lib/galaxy_test/driver/integration_util.py +++ b/lib/galaxy_test/driver/integration_util.py @@ -61,6 +61,13 @@ def skip_unless_fixed_port(): return pytest.mark.skip("GALAXY_TEST_PORT must be set for this test.") +def skip_if_github_workflow(): + if os.environ.get("GITHUB_ACTIONS", None) is None: + return _identity + + return pytest.mark.skip("This test is skipped for Github actions.") + + class IntegrationInstance(UsesApiTestCaseMixin): """Unit test case with utilities for spinning up Galaxy.""" diff --git a/test/integration/test_interactivetools_api.py b/test/integration/test_interactivetools_api.py index 6411eca9cca..7216d6ee78c 100644 --- a/test/integration/test_interactivetools_api.py +++ b/test/integration/test_interactivetools_api.py @@ -153,6 +153,7 @@ class InteractiveToolsRemoteProxyIntegrationTestCase(BaseInteractiveToolsIntegra @integration_util.skip_unless_kubernetes() @integration_util.skip_unless_amqp() +@integration_util.skip_if_github_workflow() class KubeInteractiveToolsRemoteProxyIntegrationTestCase(BaseInteractiveToolsIntegrationTestCase, RunsInterativeToolTests): """ $ git clone https://github.com/galaxyproject/gx-it-proxy.git $HOME/gx-it-proxy diff --git a/test/integration/test_kubernetes_staging.py b/test/integration/test_kubernetes_staging.py index 25994b8a0d0..187e6b27f51 100644 --- a/test/integration/test_kubernetes_staging.py +++ b/test/integration/test_kubernetes_staging.py @@ -115,6 +115,7 @@ def job_config(template_str, jobs_directory): @integration_util.skip_unless_kubernetes() @integration_util.skip_unless_amqp() +@integration_util.skip_if_github_workflow() class BaseKubernetesStagingTest(BaseJobEnvironmentIntegrationTestCase, MulledJobTestCases): # Test leverages $UWSGI_PORT in job code, need to set this up. require_uwsgi = True @@ -185,8 +186,6 @@ class KubernetesStagingContainerIntegrationTestCase(CancelsJob, BaseKubernetesSt return active -@integration_util.skip_unless_kubernetes() -@integration_util.skip_unless_fixed_port() class KubernetesDependencyResolutionIntegrationTestCase(BaseKubernetesStagingTest): @classmethod