opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-01 15:37:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup integration test configuration code.

Browse Source 
Remove copy and paste problems, remote excess configuration unrelated to the what is being tested (handler configuration, multiple worker counts, etc..).
This commit is contained in:
John Chilton
2019-05-02 08:43:19 -04:00
parent faae919af1
commit c6fcd051c8
14 changed files with 15 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/chained_dyndest_job_conf.xml
+1 -5
View File
@@ -1,16 +1,12 @@
<?xml version="1.0"?>
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
<plugin id="dynamic" type="runner">
<param id="rules_module">integration.chained_dyndest_rules.module1</param>
</plugin>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations default="dyn_dest1">
<destination id="dyn_dest1" runner="dynamic">
<param id="type">python</param>
test/integration/delay_job_conf.xml
+1 -5
View File
@@ -4,16 +4,12 @@
-->
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
<plugin id="dynamic" type="runner">
<param id="rules_module">integration.delay_rules</param>
</plugin>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations default="local_dest">
<destination id="local_dest" runner="dynamic">
test/integration/dockerized_job_conf.xml
+1 -5
View File
@@ -1,13 +1,9 @@
<?xml version="1.0"?>
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations default="local_docker">
<destination id="local_docker" runner="local">
<param id="docker_enabled">true</param>
test/integration/embedded_pulsar_job_conf.xml
+1 -4
View File
@@ -2,13 +2,10 @@
<!-- A job config for testing the Pulsar embedded runner -->
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="4"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
<plugin id="pulsar_embed" type="runner" load="galaxy.jobs.runners.pulsar:PulsarEmbeddedJobRunner">
</plugin>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations default="pulsar_embed">
<destination id="local" runner="local">
</destination>
test/integration/embedded_pulsar_metadata_job_conf.xml
+1 -4
View File
@@ -2,13 +2,10 @@
<!-- A job config for testing the Pulsar embedded runner -->
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="4"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
<plugin id="pulsar_embed" type="runner" load="galaxy.jobs.runners.pulsar:PulsarEmbeddedJobRunner">
</plugin>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations default="pulsar_embed">
<destination id="local" runner="local">
</destination>
test/integration/io_injection_job_conf.xml
+1 -6
View File
@@ -1,18 +1,13 @@
<?xml version="1.0"?>
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations>
<destination id="local_dest" runner="local">
<env exec="echo 'moo std cow'" />
<env exec="(>&amp;2 echo 'moo err cow')" />
</destination>
</destinations>
</job_conf>
test/integration/objectstore_selection_job_conf.xml
+1 -5
View File
@@ -5,16 +5,12 @@
-->
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
<plugin id="dynamic" type="runner">
<param id="rules_module">integration.objectstore_selection_rules</param>
</plugin>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations default="local">
<!-- Upload destination. -->
<destination id="local" runner="local">
test/integration/resubmission_job_conf.xml
+1 -5
View File
@@ -5,7 +5,7 @@
-->
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
<plugin id="failure_runner" type="runner" load="integration.resubmission_runners:FailsJobRunner" workers="2">
</plugin>
<plugin id="assertion_runner" type="runner" load="integration.resubmission_runners:AssertionJobRunner" workers="2">
@@ -15,10 +15,6 @@
</plugin>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations default="initial_destination">
<destination id="initial_destination" runner="dynamic">
<param id="type">python</param>
test/integration/resubmission_pulsar_job_conf.xml
+2 -6
View File
@@ -1,17 +1,13 @@
<?xml version="1.0"?>
<!--
Slimmed down resubmission_job_conf.xml for testing default resubmission rules.
Variant of resubmission_job_conf for testing Pulsar resubmission.
-->
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
<plugin id="pulsar_rest" type="runner" load="galaxy.jobs.runners.pulsar:PulsarRESTJobRunner"/>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations default="initial_pulsar">
<destination id="initial_pulsar" runner="pulsar_rest">
<!-- Use a reserved, unused ip to force a resubmission -->
test/integration/sets_tmp_dir_expression_job_conf.xml
+1 -5
View File
@@ -1,13 +1,9 @@
<?xml version="1.0"?>
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations>
<destination id="local_dest" runner="local">
<param id="tmp_dir">$(mktemp cooltmpXXXXXXXXXXXX)</param>
test/integration/sets_tmp_dir_to_true_job_conf.xml
+1 -5
View File
@@ -1,13 +1,9 @@
<?xml version="1.0"?>
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations>
<destination id="local_dest" runner="local">
<param id="tmp_dir">True</param>
test/integration/simple_job_conf.xml
+1 -5
View File
@@ -1,13 +1,9 @@
<?xml version="1.0"?>
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations>
<destination id="local_dest" runner="local">
</destination>
test/integration/singularity_job_conf.xml
+1 -5
View File
@@ -1,13 +1,9 @@
<?xml version="1.0"?>
<job_conf>
<plugins>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="2"/>
<plugin id="local" type="runner" load="galaxy.jobs.runners.local:LocalJobRunner" workers="1"/>
</plugins>
<handlers>
<handler id="main"/>
</handlers>
<destinations default="local_singularity">
<destination id="local_singularity" runner="local">
<param id="singularity_enabled">true</param>
test/integration/test_objectstore_jobs.py
+1 -5
View File
@@ -1,4 +1,4 @@
"""Integration tests for object stores."""
"""Integration tests for job and object store interactions."""
import os
import string
@@ -8,10 +8,6 @@ from base.populators import (
DatasetPopulator,
)
SCRIPT_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
EMBEDDED_PULSAR_JOB_CONFIG_FILE = os.path.join(SCRIPT_DIRECTORY, "embedded_pulsar_job_conf.xml")
DISTRIBUTED_OBJECT_STORE_CONFIG_TEMPLATE = string.Template("""<?xml version="1.0"?>
<object_store type="hierarchical">
<backends>