Rebase into dockerized jobs testing...

common-workflow-lab · Mar 13, 2017 · f5aeac7 · f5aeac7
1 parent 65cf1fb
commit f5aeac7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/test/base/driver_util.py b/test/base/driver_util.py
@@ -116,6 +116,8 @@ def setup_galaxy_config(
     update_integrated_tool_panel=False,
 ):
     """Setup environment and build config for test Galaxy instance."""
+    # For certain docker operations this needs to be evaluated out - e.g. for cwltool.
+    tmpdir = os.path.realpath(tmpdir)
     if not os.path.exists(tmpdir):
         os.makedirs(tmpdir)
     file_path = os.path.join(tmpdir, 'files')

diff --git a/test/integration/dockerized_job_conf.xml b/test/integration/dockerized_job_conf.xml
@@ -8,11 +8,19 @@
         <handler id="main"/>
     </handlers>
 
-    <destinations default="local_dest">
-        <destination id="local_dest" runner="local">
+    <destinations default="local_docker">
+        <destination id="local_docker" runner="local">
             <param id="docker_enabled">true</param>
             <param id="docker_sudo">false</param>
         </destination>
+
+        <destination id="local_upload" runner="local">
+        </destination>
+
     </destinations>
 
+    <tools>
+        <tool id="upload1" destination="local_upload" />
+    </tools>
+
 </job_conf>
diff --git a/test/integration/test_dockerized_jobs.py b/test/integration/test_dockerized_jobs.py
@@ -21,7 +21,7 @@ def handle_galaxy_config_kwds(cls, config):
         config["job_config_file"] = DOCKERIZED_JOB_CONFIG_FILE
         # Disable tool dependency resolution.
         config["tool_dependency_dir"] = "none"
-        config["enable_beta_mulled_containers"] = True
+        config["enable_beta_mulled_containers"] = "true"
 
     def setUp(self):
         super(DockerizedJobsIntegrationTestCase, self).setUp()