Remove test fixture and inline the gzip open in the test itself.

Author: yunzheng

tests/conftest.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import gzip
 import importlib.util
 import pathlib
 import tempfile
@@ -627,31 +626,3 @@ def guarded_keychain() -> Iterator[None]:
     keychain.KEYCHAIN.clear()
     yield
     keychain.KEYCHAIN.clear()
-
-
-@pytest.fixture(scope="session")
-def path_debian_ext4_raw(tmp_path_factory: pytest.TempPathFactory) -> Iterator[pathlib.Path]:
-    """Fixture that provides a path to a Debian Trixie ext4 raw image.
-
-    The image only contains a /bin directory with ~1000 files and an /etc directory with some configuration files.
-    The rest of the filesystem is not included.
-
-    The /bin files are all sparse (filled with zeros).
-    The files in /etc do contain data.
-
-    The source image is stored compressed in the test data directory to save space.
-    Compressed size is 100kb and decompresses to 5mb.
-    """
-    tmp_path = tmp_path_factory.mktemp("data")
-
-    raw_path = tmp_path / "debian-trixie-bin-ext4.raw"
-    with gzip.open(absolute_path("_data/filesystems/ext4/debian-trixie-bin-ext4.raw.gz"), "rb") as fh:
-        raw_path.write_bytes(fh.read())
-
-    return raw_path
-
-
-@pytest.fixture
-def target_debian_ext4_raw(path_debian_ext4_raw: pathlib.Path) -> Target:
-    """Fixture that provides a Target for a Debian Trixie ext4 raw image."""
-    return Target.open(path_debian_ext4_raw)

tests/tools/test_shell.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import argparse
+import gzip
 import os
 import pathlib
 import platform
@@ -13,7 +14,9 @@
 
 import pytest
 
+from dissect.target.containers.raw import RawContainer
 from dissect.target.helpers.fsutil import TargetPath, normalize
+from dissect.target.target import Target
 from dissect.target.tools.shell import (
     DebugMode,
     ExtendedCmd,
@@ -33,8 +36,6 @@
 
     from pytest_benchmark.fixture import BenchmarkFixture
 
-    from dissect.target.target import Target
-
 
 try:
     import pexpect
@@ -617,16 +618,25 @@ def ansi_new_data(cls: pexpect.expect.Expecter, data: bytes) -> int | None:
     ],
 )
 def test_benchmark_ls_bin(
-    target_debian_ext4_raw: Target,
     benchmark: BenchmarkFixture,
     args: str,
     capsys: pytest.CaptureFixture,
 ) -> None:
     """Benchmark ls command with different parameters with a /bin directory containing ~1000 files."""
+    with gzip.open(absolute_path("_data/filesystems/ext4/debian-trixie-bin-ext4.raw.gz"), "rb") as fh:
+        container = RawContainer(fh)
+
+        t = Target()
+        t.disks.add(container)
+        t.apply()
+
+        def run_ls() -> None:
+            target_cli = TargetCli(t)
+            target_cli.onecmd(f"ls {args} /bin")
 
-    def run_ls() -> None:
-        target_cli = TargetCli(target_debian_ext4_raw)
-        target_cli.onecmd(f"ls {args} /bin")
+        benchmark(run_ls)
 
-    benchmark(run_ls)
-    capsys.readouterr()
+        out, err = capsys.readouterr()
+        assert not err
+        assert "bash" in out
+        assert "zgrep" in out