make unit tests run in-process for speed (#1392)

Author: rupertnash

tests/test_content_type.py

@@ -1,15 +1,25 @@
+from typing import Any
+
 import pydot  # type: ignore
 
 from .util import get_main_output
 
 
-def test_content_types() -> None:
+def test_content_types(caplog: Any) -> None:
     for test_file in ("js_output.cwl", "js_output_workflow.cwl"):
         commands = [
             "https://raw.githubusercontent.com/common-workflow-language/common-workflow-language/main/v1.0/v1.0/test-cwl-out2.cwl",
             "https://github.com/common-workflow-language/common-workflow-language/blob/main/v1.0/v1.0/empty.json",
         ]
         error_code, _, stderr = get_main_output(commands)
 
-        assert "got content-type of 'text/html'" in stderr
+        found = False
+        for record in caplog.records:
+            if (
+                record.name == "salad"
+                and "got content-type of 'text/html'" in record.message
+            ):
+                found = True
+                break
+        assert found
         assert error_code == 1, stderr

tests/util.py

@@ -1,18 +1,20 @@
 import contextlib
 import distutils.spawn  # pylint: disable=no-name-in-module,import-error
 import functools
+import io
 import os
 import subprocess
 import sys
 from pathlib import Path
-from typing import Generator, List, Mapping, Optional, Tuple, Union
+from typing import Any, Generator, List, Mapping, Optional, Tuple, Union
 
 import pytest
 from pkg_resources import Requirement, ResolutionError, resource_filename
 
 from cwltool.context import LoadingContext, RuntimeContext
 from cwltool.executors import JobExecutor
 from cwltool.factory import Factory
+from cwltool.main import main
 from cwltool.singularity import is_version_2_6, is_version_3_or_newer
 from cwltool.utils import onWindows, windows_default_container_id
 
@@ -84,19 +86,21 @@ def get_main_output(
     env: Union[
         Mapping[bytes, Union[bytes, str]], Mapping[str, Union[bytes, str]], None
     ] = None,
+    monkeypatch: Any = None,
 ) -> Tuple[Optional[int], str, str]:
-    process = subprocess.Popen(
-        [sys.executable, "-m", "cwltool"] + args,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        env=env,
-    )
-
-    stdout, stderr = process.communicate()
+    stdout = io.StringIO()
+    stderr = io.StringIO()
+    if env is not None:
+        assert monkeypatch is not None
+        monkeypatch.setattr(os, "environ", env)
+    try:
+        rc = main(argsl=args, stdout=stdout, stderr=stderr)
+    except SystemExit as e:
+        rc = e.code
     return (
-        process.returncode,
-        stdout.decode() if stdout else "",
-        stderr.decode() if stderr else "",
+        rc,
+        stdout.getvalue(),
+        stderr.getvalue(),
     )