CWL container prepull: skip if --no-containers is specified

Author: mr-c

src/toil/cwl/cwltoil.py

@@ -4252,7 +4252,7 @@ def main(args: Optional[list[str]] = None, stdout: TextIO = sys.stdout) -> int:
                 raise
 
             # Attempt to prepull the containers
-            if not options.no_prepull:
+            if not options.no_prepull and not options.no_container:
                 try_prepull(uri, runtime_context, expected_config.batchSystem)
 
             options.tool_help = None

src/toil/test/cwl/cwlTest.py

@@ -421,6 +421,11 @@ def test_run_revsort_nochecksum(self) -> None:
             "revsort.cwl", partial(self._tester, main_args=["--no-compute-checksum"])
         )
 
+    def test_run_revsort_no_container(self) -> None:
+        self.revsort_no_checksum(
+            "revsort.cwl", partial(self._tester, main_args=["--no-container"])
+        )
+
     def test_run_revsort2(self) -> None:
         self.revsort("revsort2.cwl", self._tester)