Merge remote-tracking branch 'origin/issues/5134-ftp-get-size' into i…

…ssues/5134-ftp-get-size

requirements-cwl.txt

@@ -1,4 +1,4 @@
-cwltool==3.1.20241024121129
+cwltool==3.1.20241112140730
 schema-salad>=8.4.20230128170514,<9
 galaxy-tool-util<25
 galaxy-util<25

requirements-dev.txt

@@ -14,7 +14,7 @@ types-aws-xray-sdk
 types-boto<2.49.18.20241020
 types-Flask-Cors
 types-requests
-types-psutil
+types-psutil>=6.1.0.20241102
 types-python-dateutil
 types-setuptools
 types-xmltodict

src/toil/test/cwl/cwlTest.py

@@ -526,7 +526,12 @@ def test_slurm_node_memory(self) -> None:
             log.debug("Workflow output: %s", out)
             memory_string = out["memory"]
             log.debug("Observed memory: %s", memory_string)
-            result = int(memory_string)
+            # If there's no memory limit enforced, Slurm will return "unlimited".
+            # Set result to something sensible.
+            if memory_string.strip() == "unlimited":
+                result = 4 * 1024 * 1024
+            else:
+                result = int(memory_string)
             # We should see more than the CWL default or the Toil default, assuming Slurm nodes of reasonable size (3 GiB).
             self.assertGreater(result, 3 * 1024 * 1024)