[PATCH v2 1/9] test: when testfs feature is available, always enable it

[Ahmad Fatoum]

On 9/29/25 10:03 AM, Jonas Rebmann wrote:
> Add 9pfs devices to the qemu commandline on all platforms that support
> it (multi_v7, multi_v8) so tests relying upon it can be ran without
> specifying --fs testfs=${KBUILD_OUTPUT}/testfs.
> 
> Moving logic out of the github workflow into pytest makes integration
> tests more accessible to developers.
> 
> Introduce the fixture in existing test and drop obsolete test.
> 
> Signed-off-by: Jonas Rebmann <jre at pengutronix.de>

Reviewed-by: Ahmad Fatoum <a.fatoum at pengutronix.de>

> ---
>  .github/workflows/test-labgrid-pytest.yml | 3 ---
>  conftest.py                               | 6 ++++++
>  test/py/test_dm.py                        | 6 +-----
>  test/py/test_fit.py                       | 4 ----
>  4 files changed, 7 insertions(+), 12 deletions(-)
> 
> diff --git a/.github/workflows/test-labgrid-pytest.yml b/.github/workflows/test-labgrid-pytest.yml
> index ccf8ae172c..604f1db2fb 100644
> --- a/.github/workflows/test-labgrid-pytest.yml
> +++ b/.github/workflows/test-labgrid-pytest.yml
> @@ -116,9 +116,6 @@ jobs:
>            grep -wq '\(QEMUDriver\|ExternalConsoleDriver\):' "$i" || continue
>  
>            extraargs="${{matrix.lgargs}}"
> -          if grep -wq 'testfs' "$i"; then
> -            extraargs="${extraargs} --fs testfs=${KBUILD_OUTPUT}/testfs"
> -          fi
>  
>            cfg=$(basename $i .yaml)
>            echo "Testing $cfg"
> diff --git a/conftest.py b/conftest.py
> index 06321c938d..00969e62df 100644
> --- a/conftest.py
> +++ b/conftest.py
> @@ -208,6 +208,12 @@ def strategy(request, target, pytestconfig):
>      for arg in pytestconfig.option.qemu_arg:
>          strategy.append_qemu_args(arg)
>  
> +    if "testfs" in features:
> +        if not any(fs and fs[0] == "testfs" for fs in pytestconfig.option.qemu_fs):
> +            testfs_path = os.path.join(os.environ["LG_BUILDDIR"], "testfs")
> +            pytestconfig.option.qemu_fs.append(["testfs", testfs_path])
> +            os.makedirs(testfs_path, exist_ok=True)
> +
>      for i, fs in enumerate(pytestconfig.option.qemu_fs):
>          if virtio:
>              path = fs.pop()
> diff --git a/test/py/test_dm.py b/test/py/test_dm.py
> index a9debd85b5..8bdacf7b4e 100644
> --- a/test/py/test_dm.py
> +++ b/test/py/test_dm.py
> @@ -6,11 +6,7 @@ from .helper import of_get_property
>  
>  
>  
> -def test_dm_verity(barebox):
> -    _, _, returncode = barebox.run("ls /mnt/9p/testfs")
> -    if returncode != 0:
> -        pytest.xfail("skipping test due to missing --fs testfs=")
> -
> +def test_dm_verity(barebox, testfs):
>      barebox.run_check("cd /mnt/9p/testfs")
>  
>      # Since commands run in a subshell, export the root hash in a
> diff --git a/test/py/test_fit.py b/test/py/test_fit.py
> index 1a23a53a32..08d5feba5c 100644
> --- a/test/py/test_fit.py
> +++ b/test/py/test_fit.py
> @@ -19,10 +19,6 @@ def test_fit(barebox, env, target, barebox_config):
>      if 'testfs' not in env.get_target_features():
>          pytest.xfail("testfs feature not specified")
>  
> -    _, _, returncode = barebox.run("ls /mnt/9p/testfs")
> -    if returncode != 0:
> -        pytest.xfail("skipping test due to missing --fs testfs=")
> -
>      _, _, returncode = barebox.run(f"ls {fit_name('gzipped')}")
>      if returncode != 0:
>          pytest.xfail("skipping test due to missing FIT image")
> 

-- 
Pengutronix e.K.                  |                             |
Steuerwalder Str. 21              | http://www.pengutronix.de/  |
31137 Hildesheim, Germany         | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |