toil 6.1.0a1__py3-none-any.whl → 8.0.0__py3-none-any.whl

toil/test/wdl/wdltoil_test.py

@@ -1,29 +1,47 @@
 import json
+import logging
 import os
+import pytest
+import re
 import shutil
+import string
 import subprocess
 import unittest
-import uuid
-from typing import Any, Dict, List, Optional, Set
+from typing import Any, Optional, Union
 from unittest.mock import patch
-
-from unittest.mock import patch
-from typing import Any, Dict, List, Set
-
-from toil.test import (ToilTest,
-                       needs_docker_cuda,
-                       needs_google_storage,
-                       needs_singularity_or_docker,
-                       slow)
+from uuid import uuid4
+
+import WDL.Error
+import WDL.Expr
+
+from toil.fileStores import FileID
+from toil.test import (
+    ToilTest,
+    needs_docker,
+    needs_docker_cuda,
+    needs_google_storage,
+    needs_singularity_or_docker,
+    needs_wdl,
+    slow,
+)
 from toil.version import exactPython
-from toil.wdl.wdltoil import WDLSectionJob, WDLWorkflowGraph
+from toil.wdl.wdltoil import (
+    WDLSectionJob,
+    WDLWorkflowGraph,
+    parse_disks,
+    remove_common_leading_whitespace,
+)
 
+logger = logging.getLogger(__name__)
 
+
+@needs_wdl
 class BaseWDLTest(ToilTest):
     """Base test class for WDL tests."""
+
     def setUp(self) -> None:
         """Runs anew before each test to create farm fresh temp dirs."""
-        self.output_dir = os.path.join('/tmp/', 'toil-wdl-test-' + str(uuid.uuid4()))
+        self.output_dir = os.path.join("/tmp/", "toil-wdl-test-" + str(uuid4()))
         os.makedirs(self.output_dir)
 
     def tearDown(self) -> None:
@@ -31,52 +49,138 @@ class BaseWDLTest(ToilTest):
             shutil.rmtree(self.output_dir)
 
 
+WDL_CONFORMANCE_TEST_REPO = "https://github.com/DataBiosphere/wdl-conformance-tests.git"
+WDL_CONFORMANCE_TEST_COMMIT = "baf44bcc7e6f6927540adf77d91b26a5558ae4b7"
+# These tests are known to require things not implemented by
+# Toil and will not be run in CI.
+WDL_CONFORMANCE_TESTS_UNSUPPORTED_BY_TOIL = [
+    16,  # Basic object test (deprecated and removed in 1.1); MiniWDL and toil-wdl-runner do not support Objects, so this will fail if ran by them
+    21,  # Parser: expression placeholders in strings in conditional expressions in 1.0, Cromwell style; Fails with MiniWDL and toil-wdl-runner
+    64,  # Legacy test for as_map_as_input; It looks like MiniWDL does not have the function as_map()
+    77,  # Test that array cannot coerce to a string. WDL 1.1 does not allow compound types to coerce into a string. This should return a TypeError.
+]
+WDL_UNIT_TESTS_UNSUPPORTED_BY_TOIL = [
+    14,  # test_object, Objects are not supported
+    19,  # map_to_struct, miniwdl cannot coerce map to struct, https://github.com/chanzuckerberg/miniwdl/issues/712
+    52,  # relative_and_absolute, needs root to run
+    58,  # test_gpu, needs gpu to run, else warning
+    59,  # will be fixed in #5001
+    66,  # This needs way too many resources (and actually doesn't work?), see https://github.com/DataBiosphere/wdl-conformance-tests/blob/2d617b703a33791f75f30a9db43c3740a499cd89/README_UNIT.md?plain=1#L8
+    67,  # same as above
+    68,  # Bug, see #https://github.com/DataBiosphere/toil/issues/4993
+    69,  # Same as 68
+    87,  # MiniWDL does not handle metacharacters properly when running regex, https://github.com/chanzuckerberg/miniwdl/issues/709
+    97,  # miniwdl bug, see https://github.com/chanzuckerberg/miniwdl/issues/701
+    105, # miniwdl (and toil) bug, unserializable json is serialized, see https://github.com/chanzuckerberg/miniwdl/issues/702
+    107, # object not supported
+    108, # object not supported
+    109, # object not supported
+    110, # object not supported
+    120, # miniwdl bug, see https://github.com/chanzuckerberg/miniwdl/issues/699
+    131, # miniwdl bug, evalerror, see https://github.com/chanzuckerberg/miniwdl/issues/700
+    134, # same as 131
+    144  # miniwdl and toil bug
+]
+
+
+
 class WDLConformanceTests(BaseWDLTest):
     """
     WDL conformance tests for Toil.
     """
+
     wdl_dir = "wdl-conformance-tests"
+
     @classmethod
     def setUpClass(cls) -> None:
 
-        url = "https://github.com/DataBiosphere/wdl-conformance-tests.git"
-        commit = "032fb99a1458d456b6d5f17d27928469ec1a1c68"
-
         p = subprocess.Popen(
-            f"git clone {url} {cls.wdl_dir} && cd {cls.wdl_dir} && git checkout {commit}",
+            f"git clone {WDL_CONFORMANCE_TEST_REPO} {cls.wdl_dir} && cd {cls.wdl_dir} && git checkout {WDL_CONFORMANCE_TEST_COMMIT}",
             shell=True,
         )
 
         p.communicate()
 
         if p.returncode > 0:
-            raise RuntimeError
+            raise RuntimeError("Could not clone WDL conformance tests")
 
         os.chdir(cls.wdl_dir)
 
         cls.base_command = [exactPython, "run.py", "--runner", "toil-wdl-runner"]
 
-    # estimated running time: 2 minutes
-    @slow
-    def test_conformance_tests_v10(self):
-        tests_to_run = "0,1,5-7,9-15,17,22-24,26,28-30,32-40,53,57-59,62,67-69"
-        p = subprocess.run(self.base_command + ["-v", "1.0", "-n", tests_to_run], capture_output=True)
+    def check(self, p: subprocess.CompletedProcess) -> None:
+        """
+        Make sure a call completed or explain why it failed.
+        """
 
         if p.returncode != 0:
-            print(p.stdout.decode('utf-8', errors='replace'))
+            logger.error(
+                "Failed process standard output: %s",
+                p.stdout.decode("utf-8", errors="replace"),
+            )
+            logger.error(
+                "Failed process standard error: %s",
+                p.stderr.decode("utf-8", errors="replace"),
+            )
 
         p.check_returncode()
 
-    # estimated running time: 2 minutes
+    @slow
+    def test_unit_tests_v11(self):
+        # There are still some bugs with the WDL spec, use a fixed version until
+        # See comments of https://github.com/openwdl/wdl/pull/669
+        repo_url = "https://github.com/stxue1/wdl.git"
+        repo_branch = "wdl-1.1.3-fixes"
+        command = f"{exactPython} setup_unit_tests.py -v 1.1 --extra-patch-data unit_tests_patch_data.yaml --repo {repo_url} --branch {repo_branch} --force-pull"
+        p = subprocess.run(command.split(" "), capture_output=True)
+        self.check(p)
+        command = f"{exactPython} run_unit.py -r toil-wdl-runner -v 1.1 --progress --exclude-numbers {','.join([str(t) for t in WDL_UNIT_TESTS_UNSUPPORTED_BY_TOIL])}"
+        p = subprocess.run(command.split(" "), capture_output=True)
+        self.check(p)
+
+    # estimated running time: 10 minutes
+    @slow
+    def test_conformance_tests_v10(self):
+        command = self.base_command + ["-v", "1.0"]
+        if WDL_CONFORMANCE_TESTS_UNSUPPORTED_BY_TOIL:
+            command.append("--exclude-numbers")
+            command.append(
+                ",".join([str(t) for t in WDL_CONFORMANCE_TESTS_UNSUPPORTED_BY_TOIL])
+            )
+        p = subprocess.run(command, capture_output=True)
+
+        self.check(p)
+
+    # estimated running time: 10 minutes
     @slow
     def test_conformance_tests_v11(self):
-        tests_to_run = "2-11,13-15,17-20,22-24,26,29,30,32-40,53,57-59,62,67-69"
-        p = subprocess.run(self.base_command + ["-v", "1.1", "-n", tests_to_run], capture_output=True)
+        command = self.base_command + ["-v", "1.1"]
+        if WDL_CONFORMANCE_TESTS_UNSUPPORTED_BY_TOIL:
+            command.append("--exclude-numbers")
+            command.append(
+                ",".join([str(t) for t in WDL_CONFORMANCE_TESTS_UNSUPPORTED_BY_TOIL])
+            )
+        p = subprocess.run(command, capture_output=True)
 
-        if p.returncode != 0:
-            print(p.stdout.decode('utf-8', errors='replace'))
+        self.check(p)
 
-        p.check_returncode()
+    @slow
+    def test_conformance_tests_integration(self):
+        ids_to_run = "encode,tut01,tut02,tut03,tut04"
+        p = subprocess.run(
+            self.base_command
+            + [
+                "-v",
+                "1.0",
+                "--conformance-file",
+                "integration.yaml",
+                "--id",
+                ids_to_run,
+            ],
+            capture_output=True,
+        )
+
+        self.check(p)
 
     @classmethod
     def tearDownClass(cls) -> None:
@@ -87,10 +191,11 @@ class WDLConformanceTests(BaseWDLTest):
 
 class WDLTests(BaseWDLTest):
     """Tests for Toil's MiniWDL-based implementation."""
+
     @classmethod
     def setUpClass(cls) -> None:
         """Runs once for all tests."""
-        cls.base_command = [exactPython, '-m', 'toil.wdl.wdltoil']
+        cls.base_command = [exactPython, "-m", "toil.wdl.wdltoil"]
 
     # We inherit a testMD5sum but it is going to need Singularity or Docker
     # now. And also needs to have a WDL 1.0+ WDL file. So we replace it.
@@ -98,46 +203,338 @@ class WDLTests(BaseWDLTest):
     def test_MD5sum(self):
         """Test if Toil produces the same outputs as known good outputs for WDL's
         GATK tutorial #1."""
-        wdl = os.path.abspath('src/toil/test/wdl/md5sum/md5sum.1.0.wdl')
-        json_file = os.path.abspath('src/toil/test/wdl/md5sum/md5sum.json')
+        wdl = os.path.abspath("src/toil/test/wdl/md5sum/md5sum.1.0.wdl")
+        json_file = os.path.abspath("src/toil/test/wdl/md5sum/md5sum.json")
+
+        result_json = subprocess.check_output(
+            self.base_command
+            + [wdl, json_file, "-o", self.output_dir, "--logDebug", "--retryCount=0"]
+        )
+        result = json.loads(result_json)
+
+        assert "ga4ghMd5.value" in result
+        assert isinstance(result["ga4ghMd5.value"], str)
+        assert os.path.exists(result["ga4ghMd5.value"])
+        assert os.path.basename(result["ga4ghMd5.value"]) == "md5sum.txt"
+
+    def test_url_to_file(self):
+        """
+        Test if web URL strings can be coerced to usable Files.
+        """
+        wdl = os.path.abspath("src/toil/test/wdl/testfiles/url_to_file.wdl")
+
+        result_json = subprocess.check_output(
+            self.base_command
+            + [wdl, "-o", self.output_dir, "--logInfo", "--retryCount=0"]
+        )
+        result = json.loads(result_json)
+
+        assert "url_to_file.first_line" in result
+        assert isinstance(result["url_to_file.first_line"], str)
+        self.assertEqual(result["url_to_file.first_line"], "chr1\t248387328")
 
-        result_json = subprocess.check_output(self.base_command + [wdl, json_file, '-o', self.output_dir, '--logDebug', '--retryCount=0'])
+    @needs_docker
+    def test_wait(self):
+        """
+        Test if Bash "wait" works in WDL scripts.
+        """
+        wdl = os.path.abspath("src/toil/test/wdl/testfiles/wait.wdl")
+
+        result_json = subprocess.check_output(
+            self.base_command
+            + [
+                wdl,
+                "-o",
+                self.output_dir,
+                "--logInfo",
+                "--retryCount=0",
+                "--wdlContainer=docker",
+            ]
+        )
         result = json.loads(result_json)
 
-        assert 'ga4ghMd5.value' in result
-        assert isinstance(result['ga4ghMd5.value'], str)
-        assert os.path.exists(result['ga4ghMd5.value'])
-        assert os.path.basename(result['ga4ghMd5.value']) == 'md5sum.txt'
+        assert "wait.result" in result
+        assert isinstance(result["wait.result"], str)
+        self.assertEqual(result["wait.result"], "waited")
 
     @needs_singularity_or_docker
-    def test_miniwdl_self_test(self, extra_args: Optional[List[str]] = None) -> None:
-        """Test if the MiniWDL self test runs and produces the expected output."""
-        wdl_file = os.path.abspath('src/toil/test/wdl/miniwdl_self_test/self_test.wdl')
-        json_file = os.path.abspath('src/toil/test/wdl/miniwdl_self_test/inputs.json')
+    def test_all_call_outputs(self):
+        """
+        Test if Toil can collect all call outputs from a workflow that doesn't expose them.
+        """
+        wdl = os.path.abspath("src/toil/test/wdl/testfiles/not_enough_outputs.wdl")
 
-        result_json = subprocess.check_output(self.base_command + [wdl_file, json_file, '--logDebug', '-o', self.output_dir, '--outputDialect', 'miniwdl'] + (extra_args or []))
+        # With no flag we don't include the call outputs
+        result_json = subprocess.check_output(
+            self.base_command
+            + [wdl, "-o", self.output_dir, "--logInfo", "--retryCount=0"]
+        )
         result = json.loads(result_json)
 
-        # Expect MiniWDL-style output with a designated "dir"
+        assert "wf.only_result" in result
+        assert "wf.do_math.square" not in result
+        assert "wf.do_math.cube" not in result
+        assert "wf.should_never_output" not in result
+
+        # With flag off we don't include the call outputs
+        result_json = subprocess.check_output(
+            self.base_command
+            + [
+                wdl,
+                "-o",
+                self.output_dir,
+                "--logInfo",
+                "--retryCount=0",
+                "--allCallOutputs=false",
+            ]
+        )
+        result = json.loads(result_json)
+
+        assert "wf.only_result" in result
+        assert "wf.do_math.square" not in result
+        assert "wf.do_math.cube" not in result
+        assert "wf.should_never_output" not in result
+
+        # With flag on we do include the call outputs
+        result_json = subprocess.check_output(
+            self.base_command
+            + [
+                wdl,
+                "-o",
+                self.output_dir,
+                "--logInfo",
+                "--retryCount=0",
+                "--allCallOutputs=on",
+            ]
+        )
+        result = json.loads(result_json)
+
+        assert "wf.only_result" in result
+        assert "wf.do_math.square" in result
+        assert "wf.do_math.cube" in result
+        assert "wf.should_never_output" not in result
+
+    @needs_singularity_or_docker
+    def test_croo_detection(self):
+        """
+        Test if Toil can detect and do something sensible with Cromwell Output Organizer workflows.
+        """
+        wdl = os.path.abspath("src/toil/test/wdl/testfiles/croo.wdl")
+
+        # With no flag we should include all task outputs
+        result_json = subprocess.check_output(
+            self.base_command
+            + [wdl, "-o", self.output_dir, "--logInfo", "--retryCount=0"]
+        )
+        result = json.loads(result_json)
+
+        assert "wf.only_result" in result
+        assert "wf.do_math.square" in result
+        assert "wf.do_math.cube" in result
+        assert "wf.should_never_output" not in result
+
+        # With flag off we obey the WDL spec even if we're suspicious
+        result_json = subprocess.check_output(
+            self.base_command
+            + [
+                wdl,
+                "-o",
+                self.output_dir,
+                "--logInfo",
+                "--retryCount=0",
+                "--allCallOutputs=off",
+            ]
+        )
+        result = json.loads(result_json)
+
+        assert "wf.only_result" in result
+        assert "wf.do_math.square" not in result
+        assert "wf.do_math.cube" not in result
+        assert "wf.should_never_output" not in result
+
+    @needs_singularity_or_docker
+    def test_caching(self):
+        """
+        Test if Toil can cache task runs.
+        """
+        wdl = os.path.abspath('src/toil/test/wdl/testfiles/random.wdl')
+
+        caching_env = dict(os.environ)
+        caching_env["MINIWDL__CALL_CACHE__GET"] = "true"
+        caching_env["MINIWDL__CALL_CACHE__PUT"] = "true"
+        caching_env["MINIWDL__CALL_CACHE__DIR"] = self._createTempDir("cache")
+
+        result_json = subprocess.check_output(
+                self.base_command + [wdl, '-o', self.output_dir, '--logInfo', '--retryCount=0', '--inputs={"random.task_1_input": 1, "random.task_2_input": 1}'],
+            env=caching_env)
+        result_initial = json.loads(result_json)
+
+        assert 'random.value_seen' in result_initial
+        assert 'random.value_written' in result_initial
+
+        result_json = subprocess.check_output(
+            self.base_command + [wdl, '-o', self.output_dir, '--logInfo', '--retryCount=0', '--inputs={"random.task_1_input": 1, "random.task_2_input": 1}'],
+            env=caching_env)
+        result_cached = json.loads(result_json)
+
+        assert 'random.value_seen' in result_cached
+        assert 'random.value_written' in result_cached
+
+        assert result_cached['random.value_seen'] == result_initial['random.value_seen']
+        assert result_cached['random.value_written'] == result_initial['random.value_written']
+
+        result_json = subprocess.check_output(
+            self.base_command + [wdl, '-o', self.output_dir, '--logInfo', '--retryCount=0', '--inputs={"random.task_1_input": 2, "random.task_2_input": 1}'],
+            env=caching_env)
+        result_not_cached = json.loads(result_json)
+
+        assert 'random.value_seen' in result_not_cached
+        assert 'random.value_written' in result_not_cached
 
-        assert 'dir' in result
-        assert isinstance(result['dir'], str)
-        out_dir = result['dir']
+        assert result_not_cached['random.value_seen'] != result_initial['random.value_seen']
+        assert result_not_cached['random.value_written'] != result_initial['random.value_written']
 
-        assert 'outputs' in result
-        assert isinstance(result['outputs'], dict)
-        outputs = result['outputs']
+        result_json = subprocess.check_output(
+            self.base_command + [wdl, '-o', self.output_dir, '--logInfo', '--retryCount=0', '--inputs={"random.task_1_input": 1, "random.task_2_input": 2}'],
+            env=caching_env)
+        result_part_cached = json.loads(result_json)
 
-        assert 'hello_caller.message_files' in outputs
-        assert isinstance(outputs['hello_caller.message_files'], list)
-        assert len(outputs['hello_caller.message_files']) == 2
-        for item in outputs['hello_caller.message_files']:
-            # All the files should be strings in the "out" direcotry
-            assert isinstance(item, str)
-            assert item.startswith(out_dir)
+        assert 'random.value_seen' in result_part_cached
+        assert 'random.value_written' in result_part_cached
 
-        assert 'hello_caller.messages' in outputs
-        assert outputs['hello_caller.messages'] == ["Hello, Alyssa P. Hacker!", "Hello, Ben Bitdiddle!"]
+        assert result_part_cached['random.value_seen'] == result_initial['random.value_seen']
+        assert result_part_cached['random.value_written'] != result_initial['random.value_written']
+        assert result_part_cached['random.value_written'] != result_not_cached['random.value_written']
+
+
+
+    def test_url_to_optional_file(self):
+        """
+        Test if missing and error-producing URLs are handled correctly for optional File? values.
+        """
+        wdl = os.path.abspath("src/toil/test/wdl/testfiles/url_to_optional_file.wdl")
+
+        def run_for_code(code: int) -> dict:
+            """
+            Run a workflow coercing URL to File? where the URL returns the given status code.
+
+            Return the parsed output.
+            """
+            logger.info("Test optional file with HTTP code %s", code)
+            json_value = '{"url_to_optional_file.http_code": %d}' % code
+            result_json = subprocess.check_output(
+                self.base_command
+                + [
+                    wdl,
+                    json_value,
+                    "-o",
+                    self.output_dir,
+                    "--logInfo",
+                    "--retryCount=0",
+                ]
+            )
+            result = json.loads(result_json)
+            return result
+
+        # Check files that exist
+        result = run_for_code(200)
+        assert "url_to_optional_file.out_file" in result
+        self.assertNotEqual(result["url_to_optional_file.out_file"], None)
+
+        for code in (404, 410):
+            # Check files that definitely don't
+            result = run_for_code(code)
+            assert "url_to_optional_file.out_file" in result
+            self.assertEqual(result["url_to_optional_file.out_file"], None)
+
+        for code in (402, 418, 500, 502):
+            # Check that cases where the server refuses to say if the file
+            # exists stop the workflow.
+            with self.assertRaises(subprocess.CalledProcessError):
+                run_for_code(code)
+
+    def test_missing_output_directory(self):
+        """
+        Test if Toil can run a WDL workflow into a new directory.
+        """
+        wdl = os.path.abspath("src/toil/test/wdl/md5sum/md5sum.1.0.wdl")
+        json_file = os.path.abspath("src/toil/test/wdl/md5sum/md5sum.json")
+        subprocess.check_call(
+            self.base_command
+            + [
+                wdl,
+                json_file,
+                "-o",
+                os.path.join(self.output_dir, "does", "not", "exist"),
+                "--logDebug",
+                "--retryCount=0",
+            ]
+        )
+
+    @needs_singularity_or_docker
+    def test_miniwdl_self_test(self, extra_args: Optional[list[str]] = None) -> None:
+        """Test if the MiniWDL self test runs and produces the expected output."""
+        wdl_file = os.path.abspath("src/toil/test/wdl/miniwdl_self_test/self_test.wdl")
+        json_file = os.path.abspath("src/toil/test/wdl/miniwdl_self_test/inputs.json")
+
+        result_json = subprocess.check_output(
+            self.base_command
+            + [
+                wdl_file,
+                json_file,
+                "--logDebug",
+                "-o",
+                self.output_dir,
+                "--outputDialect",
+                "miniwdl",
+            ]
+            + (extra_args or [])
+        )
+        result = json.loads(result_json)
+
+        # Expect MiniWDL-style output with a designated "dir"
+
+        assert "dir" in result
+        assert isinstance(result["dir"], str)
+        out_dir = result["dir"]
+
+        assert "outputs" in result
+        assert isinstance(result["outputs"], dict)
+        outputs = result["outputs"]
+
+        assert "hello_caller.message_files" in outputs
+        assert isinstance(outputs["hello_caller.message_files"], list)
+        assert len(outputs["hello_caller.message_files"]) == 2
+        for item in outputs["hello_caller.message_files"]:
+            # All the files should be strings in the "out" directory
+            assert isinstance(item, str), "File output must be a string"
+            assert item.startswith(
+                out_dir
+            ), "File output must be in the output directory"
+
+            # Look at the filename within that directory
+            name_in_out_dir = item[len(out_dir) :]
+
+            # Ity should contain the job name of "hello", so they are human-readable.
+            assert (
+                "hello" in name_in_out_dir
+            ), f"File output {name_in_out_dir} should have the originating task name in it"
+
+            # And it should not contain non-human-readable content.
+            #
+            # We use a threshold number of digits as a proxy for this, but
+            # don't try and get around this by just rolling other random
+            # strings; we want these outputs to be human-readable!!!
+            digit_count = len([c for c in name_in_out_dir if c in string.digits])
+            assert (
+                digit_count < 3
+            ), f"File output {name_in_out_dir} has {digit_count} digits, which is too many to be plausibly human-readable"
+
+        assert "hello_caller.messages" in outputs
+        assert outputs["hello_caller.messages"] == [
+            "Hello, Alyssa P. Hacker!",
+            "Hello, Ben Bitdiddle!",
+        ]
 
     @needs_singularity_or_docker
     def test_miniwdl_self_test_by_reference(self) -> None:
@@ -146,6 +543,23 @@ class WDLTests(BaseWDLTest):
         """
         self.test_miniwdl_self_test(extra_args=["--referenceInputs=True"])
 
+    @pytest.mark.integrative
+    @needs_singularity_or_docker
+    def test_dockstore_trs(self, extra_args: Optional[list[str]] = None) -> None:
+        wdl_file = "#workflow/github.com/dockstore/bcc2020-training/HelloWorld:master"
+        # Needs an input but doesn't provide a good one.
+        json_input = json.dumps({"hello_world.hello.myName": "https://raw.githubusercontent.com/dockstore/bcc2020-training/refs/heads/master/wdl-training/exercise1/name.txt"})
+
+        result_json = subprocess.check_output(
+            self.base_command + [wdl_file, json_input, '--logDebug', '-o', self.output_dir, '--outputDialect',
+                                 'miniwdl'] + (extra_args or []))
+        result = json.loads(result_json)
+
+        with open(result.get("outputs", {}).get("hello_world.helloFile")) as f:
+            result_text = f.read().strip()
+
+        self.assertEqual(result_text, "Hello World!\nMy name is potato.")
+
     @slow
     @needs_docker_cuda
     def test_giraffe_deepvariant(self):
@@ -153,84 +567,111 @@ class WDLTests(BaseWDLTest):
         # TODO: enable test if nvidia-container-runtime and Singularity are installed but Docker isn't.
 
         json_dir = self._createTempDir()
-        base_uri = 'https://raw.githubusercontent.com/vgteam/vg_wdl/65dd739aae765f5c4dedd14f2e42d5a263f9267a'
+        base_uri = "https://raw.githubusercontent.com/vgteam/vg_wdl/65dd739aae765f5c4dedd14f2e42d5a263f9267a"
 
         wdl_file = f"{base_uri}/workflows/giraffe_and_deepvariant.wdl"
-        json_file = os.path.abspath(os.path.join(json_dir, 'inputs.json'))
-        with open(json_file, 'w') as fp:
+        json_file = os.path.abspath(os.path.join(json_dir, "inputs.json"))
+        with open(json_file, "w") as fp:
             # Write some inputs. We need to override the example inputs to use a GPU container, but that means we need absolute input URLs.
-            json.dump(fp, {
-                "GiraffeDeepVariant.INPUT_READ_FILE_1": f"{base_uri}/tests/small_sim_graph/reads_1.fastq.gz",
-                "GiraffeDeepVariant.INPUT_READ_FILE_2": f"{base_uri}/tests/small_sim_graph/reads_2.fastq.gz",
-                "GiraffeDeepVariant.XG_FILE": f"{base_uri}/tests/small_sim_graph/graph.xg",
-                "GiraffeDeepVariant.SAMPLE_NAME": "s0",
-                "GiraffeDeepVariant.GBWT_FILE": f"{base_uri}/tests/small_sim_graph/graph.gbwt",
-                "GiraffeDeepVariant.GGBWT_FILE": f"{base_uri}/tests/small_sim_graph/graph.gg",
-                "GiraffeDeepVariant.MIN_FILE": f"{base_uri}/tests/small_sim_graph/graph.min",
-                "GiraffeDeepVariant.DIST_FILE": f"{base_uri}/tests/small_sim_graph/graph.dist",
-                "GiraffeDeepVariant.OUTPUT_GAF": True,
-                "GiraffeDeepVariant.runDeepVariantCallVariants.in_dv_gpu_container": "google/deepvariant:1.3.0-gpu"
-            })
-
-        result_json = subprocess.check_output(self.base_command + [wdl_file, json_file, '-o', self.output_dir, '--outputDialect', 'miniwdl'])
+            json.dump(
+                fp,
+                {
+                    "GiraffeDeepVariant.INPUT_READ_FILE_1": f"{base_uri}/tests/small_sim_graph/reads_1.fastq.gz",
+                    "GiraffeDeepVariant.INPUT_READ_FILE_2": f"{base_uri}/tests/small_sim_graph/reads_2.fastq.gz",
+                    "GiraffeDeepVariant.XG_FILE": f"{base_uri}/tests/small_sim_graph/graph.xg",
+                    "GiraffeDeepVariant.SAMPLE_NAME": "s0",
+                    "GiraffeDeepVariant.GBWT_FILE": f"{base_uri}/tests/small_sim_graph/graph.gbwt",
+                    "GiraffeDeepVariant.GGBWT_FILE": f"{base_uri}/tests/small_sim_graph/graph.gg",
+                    "GiraffeDeepVariant.MIN_FILE": f"{base_uri}/tests/small_sim_graph/graph.min",
+                    "GiraffeDeepVariant.DIST_FILE": f"{base_uri}/tests/small_sim_graph/graph.dist",
+                    "GiraffeDeepVariant.OUTPUT_GAF": True,
+                    "GiraffeDeepVariant.runDeepVariantCallVariants.in_dv_gpu_container": "google/deepvariant:1.3.0-gpu",
+                },
+            )
+
+        result_json = subprocess.check_output(
+            self.base_command
+            + [wdl_file, json_file, "-o", self.output_dir, "--outputDialect", "miniwdl"]
+        )
         result = json.loads(result_json)
 
         # Expect MiniWDL-style output with a designated "dir"
-        assert 'dir' in result
-        assert isinstance(result['dir'], str)
-        out_dir = result['dir']
+        assert "dir" in result
+        assert isinstance(result["dir"], str)
+        out_dir = result["dir"]
 
-        assert 'outputs' in result
-        assert isinstance(result['outputs'], dict)
-        outputs = result['outputs']
+        assert "outputs" in result
+        assert isinstance(result["outputs"], dict)
+        outputs = result["outputs"]
 
         # Expect a VCF file to have been written
-        assert 'GiraffeDeepVariant.output_vcf' in outputs
-        assert isinstance(outputs['GiraffeDeepVariant.output_vcf'], str)
-        assert os.path.exists(outputs['GiraffeDeepVariant.output_vcf'])
+        assert "GiraffeDeepVariant.output_vcf" in outputs
+        assert isinstance(outputs["GiraffeDeepVariant.output_vcf"], str)
+        assert os.path.exists(outputs["GiraffeDeepVariant.output_vcf"])
 
     @slow
     @needs_singularity_or_docker
     def test_giraffe(self):
         """Test if Giraffe runs. This could take 12 minutes. Also we scale it down but it still demands lots of memory."""
         # TODO: enable test if nvidia-container-runtime and Singularity are installed but Docker isn't.
+        # TODO: Reduce memory requests with custom/smaller inputs.
+        # TODO: Skip if node lacks enough memory.
 
         json_dir = self._createTempDir()
-        base_uri = 'https://raw.githubusercontent.com/vgteam/vg_wdl/65dd739aae765f5c4dedd14f2e42d5a263f9267a'
+        base_uri = "https://raw.githubusercontent.com/vgteam/vg_wdl/65dd739aae765f5c4dedd14f2e42d5a263f9267a"
         wdl_file = f"{base_uri}/workflows/giraffe.wdl"
         json_file = f"{base_uri}/params/giraffe.json"
 
-        result_json = subprocess.check_output(self.base_command + [wdl_file, json_file, '-o', self.output_dir, '--outputDialect', 'miniwdl', '--scale', '0.1'])
+        result_json = subprocess.check_output(
+            self.base_command
+            + [
+                wdl_file,
+                json_file,
+                "-o",
+                self.output_dir,
+                "--outputDialect",
+                "miniwdl",
+                "--scale",
+                "0.1",
+                "--logDebug",
+            ]
+        )
         result = json.loads(result_json)
 
         # Expect MiniWDL-style output with a designated "dir"
-        assert 'dir' in result
-        assert isinstance(result['dir'], str)
-        out_dir = result['dir']
+        assert "dir" in result
+        assert isinstance(result["dir"], str)
+        out_dir = result["dir"]
 
-        assert 'outputs' in result
-        assert isinstance(result['outputs'], dict)
-        outputs = result['outputs']
+        assert "outputs" in result
+        assert isinstance(result["outputs"], dict)
+        outputs = result["outputs"]
 
         # Expect a BAM file to have been written
-        assert 'Giraffe.output_bam' in outputs
-        assert isinstance(outputs['Giraffe.output_bam'], str)
-        assert os.path.exists(outputs['Giraffe.output_bam'])
+        assert "Giraffe.output_bam" in outputs
+        assert isinstance(outputs["Giraffe.output_bam"], str)
+        assert os.path.exists(outputs["Giraffe.output_bam"])
 
     @needs_singularity_or_docker
     @needs_google_storage
     def test_gs_uri(self):
         """Test if Toil can access Google Storage URIs."""
-        wdl = os.path.abspath('src/toil/test/wdl/md5sum/md5sum.1.0.wdl')
-        json_file = os.path.abspath('src/toil/test/wdl/md5sum/md5sum-gs.json')
+        wdl = os.path.abspath("src/toil/test/wdl/md5sum/md5sum.1.0.wdl")
+        json_file = os.path.abspath("src/toil/test/wdl/md5sum/md5sum-gs.json")
 
-        result_json = subprocess.check_output(self.base_command + [wdl, json_file, '-o', self.output_dir, '--logDebug'])
+        result_json = subprocess.check_output(
+            self.base_command + [wdl, json_file, "-o", self.output_dir, "--logDebug"]
+        )
         result = json.loads(result_json)
 
-        assert 'ga4ghMd5.value' in result
-        assert isinstance(result['ga4ghMd5.value'], str)
-        assert os.path.exists(result['ga4ghMd5.value'])
-        assert os.path.basename(result['ga4ghMd5.value']) == 'md5sum.txt'
+        assert "ga4ghMd5.value" in result
+        assert isinstance(result["ga4ghMd5.value"], str)
+        assert os.path.exists(result["ga4ghMd5.value"])
+        assert os.path.basename(result["ga4ghMd5.value"]) == "md5sum.txt"
+
+
+class WDLToilBenchTests(ToilTest):
+    """Tests for Toil's MiniWDL-based implementation that don't run workflows."""
 
     def test_coalesce(self):
         """
@@ -241,9 +682,9 @@ class WDLTests(BaseWDLTest):
 
         # Set up data structures for our fake workflow graph to pull from.
         # This has all decl-type nodes
-        all_decls: Set[str] = set()
+        all_decls: set[str] = set()
         # And this has all transitive dependencies for all nodes.
-        all_deps: Dict[str, Set[str]] = {}
+        all_deps: dict[str, set[str]] = {}
 
         def mock_is_decl(self: Any, node_id: str) -> bool:
             """
@@ -251,7 +692,7 @@ class WDLTests(BaseWDLTest):
             """
             return node_id in all_decls
 
-        def mock_get_transitive_dependencies(self: Any, node_id: str) -> Set[str]:
+        def mock_get_transitive_dependencies(self: Any, node_id: str) -> set[str]:
             """
             Replacement function to get all the transitive dependencies of a node.
             """
@@ -263,19 +704,21 @@ class WDLTests(BaseWDLTest):
         #
         # If that changes, the test will need to change! Maybe then it will be
         # worth extracting a base type for this interface.
-        with patch.object(WDLWorkflowGraph, 'is_decl', mock_is_decl):
-            with patch.object(WDLWorkflowGraph, 'get_transitive_dependencies', mock_get_transitive_dependencies):
-
+        with patch.object(WDLWorkflowGraph, "is_decl", mock_is_decl):
+            with patch.object(
+                WDLWorkflowGraph,
+                "get_transitive_dependencies",
+                mock_get_transitive_dependencies,
+            ):
                 with self.subTest(msg="Two unrelated decls can coalesce"):
                     # Set up two unrelated decls
                     all_decls = {"decl1", "decl2"}
-                    all_deps = {
-                        "decl1": set(),
-                        "decl2": set()
-                    }
+                    all_deps = {"decl1": set(), "decl2": set()}
+
+                    result = WDLSectionJob.coalesce_nodes(
+                        ["decl1", "decl2"], WDLWorkflowGraph([])
+                    )
 
-                    result = WDLSectionJob.coalesce_nodes(["decl1", "decl2"], WDLWorkflowGraph([]))
-                    
                     # Make sure they coalesced
                     assert len(result) == 1
                     assert "decl1" in result[0]
@@ -283,61 +726,287 @@ class WDLTests(BaseWDLTest):
 
                 with self.subTest(msg="A decl will not coalesce with a non-decl"):
                     all_decls = {"decl"}
-                    all_deps = {
-                        "decl": set(),
-                        "nondecl": set()
-                    }
+                    all_deps = {"decl": set(), "nondecl": set()}
+
+                    result = WDLSectionJob.coalesce_nodes(
+                        ["decl", "nondecl"], WDLWorkflowGraph([])
+                    )
 
-                    result = WDLSectionJob.coalesce_nodes(["decl", "nondecl"], WDLWorkflowGraph([]))
-                    
                     assert len(result) == 2
                     assert len(result[0]) == 1
                     assert len(result[1]) == 1
 
-
-                with self.subTest(msg="Two adjacent decls with a common dependency can coalesce"):
+                with self.subTest(
+                    msg="Two adjacent decls with a common dependency can coalesce"
+                ):
                     all_decls = {"decl1", "decl2"}
-                    all_deps = {
-                        "decl1": {"base"},
-                        "decl2": {"base"},
-                        "base": set()
-                    }
-
-                    result = WDLSectionJob.coalesce_nodes(["base", "decl1", "decl2"], WDLWorkflowGraph([]))
-                    
+                    all_deps = {"decl1": {"base"}, "decl2": {"base"}, "base": set()}
+
+                    result = WDLSectionJob.coalesce_nodes(
+                        ["base", "decl1", "decl2"], WDLWorkflowGraph([])
+                    )
+
                     assert len(result) == 2
                     assert "base" in result[0]
                     assert "decl1" in result[1]
                     assert "decl2" in result[1]
 
-                with self.subTest(msg="Two adjacent decls with different dependencies will not coalesce"):
+                with self.subTest(
+                    msg="Two adjacent decls with different dependencies will not coalesce"
+                ):
                     all_decls = {"decl1", "decl2"}
-                    all_deps = {
-                        "decl1": {"base"},
-                        "decl2": set(),
-                        "base": set()
-                    }
-
-                    result = WDLSectionJob.coalesce_nodes(["base", "decl1", "decl2"], WDLWorkflowGraph([]))
-                    
+                    all_deps = {"decl1": {"base"}, "decl2": set(), "base": set()}
+
+                    result = WDLSectionJob.coalesce_nodes(
+                        ["base", "decl1", "decl2"], WDLWorkflowGraph([])
+                    )
+
                     assert len(result) == 3
                     assert "base" in result[0]
 
-                with self.subTest(msg="Two adjacent decls with different successors will coalesce"):
+                with self.subTest(
+                    msg="Two adjacent decls with different successors will coalesce"
+                ):
                     all_decls = {"decl1", "decl2"}
-                    all_deps = {
-                        "decl1": set(),
-                        "decl2": set(),
-                        "successor": {"decl2"}
-                    }
-
-                    result = WDLSectionJob.coalesce_nodes(["decl1", "decl2", "successor"], WDLWorkflowGraph([]))
-                    
+                    all_deps = {"decl1": set(), "decl2": set(), "successor": {"decl2"}}
+
+                    result = WDLSectionJob.coalesce_nodes(
+                        ["decl1", "decl2", "successor"], WDLWorkflowGraph([])
+                    )
+
                     assert len(result) == 2
                     assert "decl1" in result[0]
                     assert "decl2" in result[0]
                     assert "successor" in result[1]
 
+    def make_string_expr(self, to_parse: str) -> WDL.Expr.String:
+        """
+        Parse pseudo-WDL for testing whitespace removal.
+        """
+
+        pos = WDL.Error.SourcePosition("nowhere", "nowhere", 0, 0, 0, 0)
+
+        parts: list[Union[str, WDL.Expr.Placeholder]] = re.split("(~{[^}]*})", to_parse)
+        for i in range(1, len(parts), 2):
+            parts[i] = WDL.Expr.Placeholder(pos, {}, WDL.Expr.Null(pos))
+
+        return WDL.Expr.String(pos, parts)
+
+    def test_remove_common_leading_whitespace(self):
+        """
+        Make sure leading whitespace removal works properly.
+        """
+
+        # For a single line, we remove its leading whitespace
+        expr = self.make_string_expr(" a ~{b} c")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == "a "
+        assert trimmed.parts[2] == " c"
+
+        # Whitespace removed isn't affected by totally blank lines
+        expr = self.make_string_expr("    \n\n    a\n    ~{stuff}\n    b\n\n")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == "\n\na\n"
+        assert trimmed.parts[2] == "\nb\n\n"
+
+        # Unless blank toleration is off
+        expr = self.make_string_expr("    \n\n    a\n    ~{stuff}\n    b\n\n")
+        trimmed = remove_common_leading_whitespace(expr, tolerate_blanks=False)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == "    \n\n    a\n    "
+        assert trimmed.parts[2] == "\n    b\n\n"
+
+        # Whitespace is still removed if the first line doesn't have it before the newline
+        expr = self.make_string_expr("\n    a\n    ~{stuff}\n    b\n")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == "\na\n"
+        assert trimmed.parts[2] == "\nb\n"
+
+        # Whitespace is not removed if actual content is dedented
+        expr = self.make_string_expr("    \n\n    a\n    ~{stuff}\nuhoh\n    b\n\n")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == "    \n\n    a\n    "
+        assert trimmed.parts[2] == "\nuhoh\n    b\n\n"
+
+        # Unless dedents are tolerated
+        expr = self.make_string_expr("    \n\n    a\n    ~{stuff}\nuhoh\n    b\n\n")
+        trimmed = remove_common_leading_whitespace(expr, tolerate_dedents=True)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == "\n\na\n"
+        assert trimmed.parts[2] == "\nuhoh\nb\n\n"
+
+        # Whitespace is still removed if all-whitespace lines have less of it
+        expr = self.make_string_expr("\n    a\n    ~{stuff}\n  \n    b\n")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == "\na\n"
+        assert trimmed.parts[2] == "\n\nb\n"
+
+        # Unless all-whitespace lines are not tolerated
+        expr = self.make_string_expr("\n    a\n    ~{stuff}\n  \n    b\n")
+        trimmed = remove_common_leading_whitespace(expr, tolerate_all_whitespace=False)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == "\n  a\n  "
+        assert trimmed.parts[2] == "\n\n  b\n"
+
+        # When mixed tabs and spaces are detected, nothing is changed.
+        expr = self.make_string_expr("\n    a\n\t~{stuff}\n    b\n")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == "\n    a\n\t"
+        assert trimmed.parts[2] == "\n    b\n"
+
+        # When mixed tabs and spaces are not in the prefix, whitespace is removed.
+        expr = self.make_string_expr("\n\ta\n\t~{stuff} \n\tb\n")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == "\na\n"
+        assert trimmed.parts[2] == " \nb\n"
+
+        # An empty string works
+        expr = self.make_string_expr("")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 1
+        assert trimmed.parts[0] == ""
+
+        # A string of only whitespace is preserved as an all-whitespece line
+        expr = self.make_string_expr("\t\t\t")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 1
+        assert trimmed.parts[0] == "\t\t\t"
+
+        # A string of only whitespace is trimmed when all-whitespace lines are not tolerated
+        expr = self.make_string_expr("\t\t\t")
+        trimmed = remove_common_leading_whitespace(expr, tolerate_all_whitespace=False)
+        assert len(trimmed.parts) == 1
+        assert trimmed.parts[0] == ""
+
+        # An empty expression works
+        expr = WDL.Expr.String(
+            WDL.Error.SourcePosition("nowhere", "nowhere", 0, 0, 0, 0), []
+        )
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 0
+
+        # An expression of only placeholders works
+        expr = self.make_string_expr("~{AAA}")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert len(trimmed.parts) == 3
+        assert trimmed.parts[0] == ""
+        assert trimmed.parts[2] == ""
+
+        # The command flag is preserved
+        expr = self.make_string_expr(" a ~{b} c")
+        trimmed = remove_common_leading_whitespace(expr)
+        assert trimmed.command == False
+        expr.command = True
+        trimmed = remove_common_leading_whitespace(expr)
+        assert trimmed.command == True
+
+    def test_choose_human_readable_directory(self):
+        """
+        Test to make sure that we pick sensible but non-colliding directories to put files in.
+        """
+
+        from toil.wdl.wdltoil import (
+            DirectoryNamingStateDict,
+            choose_human_readable_directory,
+        )
+
+        state: DirectoryNamingStateDict = {}
+
+        # The first time we should get  apath with the task name and without the ID
+        first_chosen = choose_human_readable_directory(
+            "root", "taskname", "111-222-333", state
+        )
+        assert first_chosen.startswith("root")
+        assert "taskname" in first_chosen
+        assert "111-222-333" not in first_chosen
+
+        # If we use the same ID we should get the same result
+        same_id = choose_human_readable_directory(
+            "root", "taskname", "111-222-333", state
+        )
+        self.assertEqual(same_id, first_chosen)
+
+        # If we use a different ID we shoudl get a different result still obeying the constraints
+        diff_id = choose_human_readable_directory(
+            "root", "taskname", "222-333-444", state
+        )
+        self.assertNotEqual(diff_id, first_chosen)
+        assert diff_id.startswith("root")
+        assert "taskname" in diff_id
+        assert "222-333-444" not in diff_id
+
+    def test_uri_packing(self):
+        """
+        Test to make sure Toil URI packing brings through the required information.
+        """
+
+        from toil.wdl.wdltoil import pack_toil_uri, unpack_toil_uri
+
+        # Set up a file
+        file_id = FileID("fileXYZ", 123, True)
+        task_path = "the_wf.the_task"
+        dir_id = uuid4()
+        file_basename = "thefile.txt"
+
+        # Pack and unpack it
+        uri = pack_toil_uri(file_id, task_path, dir_id, file_basename)
+        unpacked = unpack_toil_uri(uri)
+
+        # Make sure we got what we put in
+        self.assertEqual(unpacked[0], file_id)
+        self.assertEqual(unpacked[0].size, file_id.size)
+        self.assertEqual(unpacked[0].executable, file_id.executable)
+
+        self.assertEqual(unpacked[1], task_path)
+
+        # TODO: We don't make the UUIDs back into UUID objects
+        self.assertEqual(unpacked[2], str(dir_id))
+
+        self.assertEqual(unpacked[3], file_basename)
+
+    def test_disk_parse(self):
+        """
+        Test to make sure the disk parsing is correct
+        """
+        # Test cromwell compatibility
+        spec = "local-disk 5 SSD"
+        specified_mount_point, part_size, part_suffix = parse_disks(spec, spec)
+        self.assertEqual(specified_mount_point, None)
+        self.assertEqual(part_size, 5)
+        self.assertEqual(part_suffix, "GB")
+
+        # Test spec conformance
+        # https://github.com/openwdl/wdl/blob/e43e042104b728df1f1ad6e6145945d2b32331a6/SPEC.md?plain=1#L5072-L5082
+        spec = "10"
+        specified_mount_point, part_size, part_suffix = parse_disks(spec, spec)
+        self.assertEqual(specified_mount_point, None)
+        self.assertEqual(part_size, 10)
+        self.assertEqual(part_suffix, "GiB")  # WDL spec default
+
+        spec = "1 MB"
+        specified_mount_point, part_size, part_suffix = parse_disks(spec, spec)
+        self.assertEqual(specified_mount_point, None)
+        self.assertEqual(part_size, 1)
+        self.assertEqual(part_suffix, "MB")
+
+        spec = "MOUNT_POINT 3"
+        specified_mount_point, part_size, part_suffix = parse_disks(spec, spec)
+        self.assertEqual(specified_mount_point, "MOUNT_POINT")
+        self.assertEqual(part_size, 3)
+        self.assertEqual(part_suffix, "GiB")
+
+        spec = "MOUNT_POINT 2 MB"
+        specified_mount_point, part_size, part_suffix = parse_disks(spec, spec)
+        self.assertEqual(specified_mount_point, "MOUNT_POINT")
+        self.assertEqual(part_size, 2)
+        self.assertEqual(part_suffix, "MB")
 
 if __name__ == "__main__":
     unittest.main()  # run all tests