Revert "environment tests, improve thread safety"

This reverts commit 22beace.

Author: mr-c

tests/test_environment.py

@@ -190,21 +190,18 @@ def BIND(v: str, env: Env) -> bool:
 
 # CRT = container runtime
 CRT_PARAMS = pytest.mark.parametrize(
-    "crt_params_",
+    "crt_params",
     [
-        NoContainer,
-        pytest.param(Docker, marks=needs_docker),
-        pytest.param(Singularity, marks=needs_singularity),
+        NoContainer(),
+        pytest.param(Docker(), marks=needs_docker),
+        pytest.param(Singularity(), marks=needs_singularity),
     ],
 )
 
 
 @CRT_PARAMS
-def test_basic(
-    crt_params_: type[CheckHolder], tmp_path: Path, monkeypatch: pytest.MonkeyPatch
-) -> None:
+def test_basic(crt_params: CheckHolder, tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
     """Test that basic env vars (only) show up."""
-    crt_params = crt_params_()
     tmp_prefix = str(tmp_path / "canary")
     extra_env = {
         "USEDVAR": "VARVAL",
@@ -224,10 +221,9 @@ def test_basic(
 
 @CRT_PARAMS
 def test_preserve_single(
-    crt_params_: type[CheckHolder], tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    crt_params: CheckHolder, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     """Test that preserving a single env var works."""
-    crt_params = crt_params_()
     tmp_prefix = str(tmp_path / "canary")
     extra_env = {
         "USEDVAR": "VARVAL",
@@ -246,20 +242,19 @@ def test_preserve_single(
     )
     checks = crt_params.checks(tmp_prefix)
     checks["USEDVAR"] = extra_env["USEDVAR"]
-    if crt_params_ == Singularity:
+    if isinstance(crt_params, Singularity):
         print(f"Singularity version: {get_version()}.")
     assert_env_matches(checks, env)
 
 
 @CRT_PARAMS
 def test_preserve_single_missing(
-    crt_params_: type[CheckHolder],
+    crt_params: CheckHolder,
     tmp_path: Path,
     monkeypatch: pytest.MonkeyPatch,
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test that attempting to preserve an unset env var produces a warning."""
-    crt_params = crt_params_()
     tmp_prefix = str(tmp_path / "canary")
     args = crt_params.flags + [
         f"--tmpdir-prefix={tmp_prefix}",
@@ -276,17 +271,16 @@ def test_preserve_single_missing(
     assert (
         "Attempting to preserve environment variable " "'RANDOMVAR' which is not present"
     ) in caplog.text
-    if crt_params_ == Singularity:
+    if isinstance(crt_params, Singularity):
         print(f"Singularity version: {get_version()}.")
     assert_env_matches(checks, env)
 
 
 @CRT_PARAMS
 def test_preserve_all(
-    crt_params_: type[CheckHolder], tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    crt_params: CheckHolder, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     """Test that preserving all works."""
-    crt_params = crt_params_()
     tmp_prefix = str(tmp_path / "canary")
     extra_env = {
         "USEDVAR": "VARVAL",
@@ -312,12 +306,12 @@ def test_preserve_all(
             assert_envvar_matches(checks[vname], vname, env)
         except KeyError as kerr:
             if vname not in os.environ:
-                if crt_params_ == Singularity:
+                if isinstance(crt_params, Singularity):
                     print(f"Singularity version: {get_version()}.")
                 raise kerr
             assert val == os.environ[vname]
         except AssertionError:
-            if crt_params_ == Singularity:
+            if isinstance(crt_params, Singularity):
                 print(f"Singularity version: {get_version()}.")
             if vname == "HOME" or vname == "TMPDIR":
                 # These MUST be OK