Return to skipping Kubernetes staging tests on Github actions...

... still working out some kind of issue with these.
This commit is contained in:
John Chilton
2020-04-23 12:12:51 -04:00
parent a29d82c4d4
commit 52bd3ad966
3 changed files with 9 additions and 2 deletions
@@ -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."""
@@ -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
+1 -2
View File
@@ -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