Re: [PATCH v5 32/34] bootstd: Add setup for the bootflow tests

[Heinrich Schuchardt <xypron.glpk@gmx.de>]

On 4/25/22 07:31, Simon Glass wrote:
> We need to create a disk image with a partition table and a DOS-format
> filesystem containing a few files. Provide a fallback binary for CI since
> it does not seem able to detect the loopback partitions.
>
> Add this to a dm_init test so that it happens when needed.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> (no changes since v3)
>
> Changes in v3:
> - Update test condition to use CMD_BOOTFLOW
>
>   test/py/tests/bootstd/mmc1.img.xz | Bin 0 -> 4448 bytes
>   test/py/tests/test_ut.py          | 103 ++++++++++++++++++++++++++++++
>   2 files changed, 103 insertions(+)
>   create mode 100644 test/py/tests/bootstd/mmc1.img.xz
>
> diff --git a/test/py/tests/bootstd/mmc1.img.xz b/test/py/tests/bootstd/mmc1.img.xz
> new file mode 100644
> index 0000000000000000000000000000000000000000..4e7f39b830eb4bddcb9ff6df39e89f130b5706b9
> GIT binary patch
> literal 4448
> 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
>
> literal 0
> HcmV?d00001
>
> diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py
> index 01c2b3ffa12..35fb393c1ff 100644
> --- a/test/py/tests/test_ut.py
> +++ b/test/py/tests/test_ut.py
> @@ -1,9 +1,102 @@
>   # SPDX-License-Identifier: GPL-2.0
>   # Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
>
> +import gzip
> +import os
>   import os.path
>   import pytest
>
> +import u_boot_utils
> +
> +def mkdir_cond(dirname):
> +    """Create a directory if it doesn't already exist
> +
> +    Args:
> +        dirname: Name of directory to create
> +    """
> +    if not os.path.exists(dirname):
> +        os.mkdir(dirname)
> +
> +def setup_bootflow_image(u_boot_console):
> +    """Create a 20MB disk image with a single FAT partition"""
> +    cons = u_boot_console
> +    fname = os.path.join(cons.config.source_dir, 'mmc1.img')
> +    mnt = os.path.join(cons.config.persistent_data_dir, 'mnt')
> +    mkdir_cond(mnt)
> +
> +    u_boot_utils.run_and_log(cons, 'qemu-img create %s 20M' % fname)
> +    u_boot_utils.run_and_log(cons, 'sudo sfdisk %s' % fname,
> +                             stdin=b'type=c')

We should never request to run a test as sudo.

Please, change this test to use virt-make-fs like we do in all other
tests that create an image.

Best regards

Heinrich

> +
> +    loop = None
> +    mounted = False
> +    complete = False
> +    try:
> +        out = u_boot_utils.run_and_log(cons,
> +                                       'sudo losetup --show -f -P %s' % fname)
> +        loop = out.strip()
> +        fatpart = '%sp1' % loop
> +        u_boot_utils.run_and_log(cons, 'sudo mkfs.vfat %s' % fatpart)
> +        u_boot_utils.run_and_log(
> +            cons, 'sudo mount -o loop %s %s -o uid=%d,gid=%d' %
> +            (fatpart, mnt, os.getuid(), os.getgid()))
> +        mounted = True
> +
> +        vmlinux = 'vmlinuz-5.3.7-301.fc31.armv7hl'
> +        initrd = 'initramfs-5.3.7-301.fc31.armv7hl.img'
> +        dtbdir = 'dtb-5.3.7-301.fc31.armv7hl'
> +        script = '''# extlinux.conf generated by appliance-creator
> +ui menu.c32
> +menu autoboot Welcome to Fedora-Workstation-armhfp-31-1.9. Automatic boot in # second{,s}. Press a key for options.
> +menu title Fedora-Workstation-armhfp-31-1.9 Boot Options.
> +menu hidden
> +timeout 20
> +totaltimeout 600
> +
> +label Fedora-Workstation-armhfp-31-1.9 (5.3.7-301.fc31.armv7hl)
> +        kernel /%s
> +        append ro root=UUID=9732b35b-4cd5-458b-9b91-80f7047e0b8a rhgb quiet LANG=en_US.UTF-8 cma=192MB cma=256MB
> +        fdtdir /%s/
> +        initrd /%s''' % (vmlinux, dtbdir, initrd)
> +        ext = os.path.join(mnt, 'extlinux')
> +        mkdir_cond(ext)
> +
> +        with open(os.path.join(ext, 'extlinux.conf'), 'w') as fd:
> +            print(script, file=fd)
> +
> +        inf = os.path.join(cons.config.persistent_data_dir, 'inf')
> +        with open(inf, 'wb') as fd:
> +            fd.write(gzip.compress(b'vmlinux'))
> +        u_boot_utils.run_and_log(cons, 'mkimage -f auto -d %s %s' %
> +                                 (inf, os.path.join(mnt, vmlinux)))
> +
> +        with open(os.path.join(mnt, initrd), 'w') as fd:
> +            print('initrd', file=fd)
> +
> +        mkdir_cond(os.path.join(mnt, dtbdir))
> +
> +        dtb_file = os.path.join(mnt, '%s/sandbox.dtb' % dtbdir)
> +        u_boot_utils.run_and_log(
> +            cons, 'dtc -o %s' % dtb_file, stdin=b'/dts-v1/; / {};')
> +        complete = True
> +    except ValueError as exc:
> +        print('Falled to create image, failing back to prepared copy: %s',
> +              str(exc))
> +    finally:
> +        if mounted:
> +            u_boot_utils.run_and_log(cons, 'sudo umount %s' % mnt)
> +        if loop:
> +            u_boot_utils.run_and_log(cons, 'sudo losetup -d %s' % loop)
> +
> +    if not complete:
> +        # Use a prepared image since we cannot create one
> +        infname = os.path.join(cons.config.source_dir,
> +                               'test/py/tests/bootstd/mmc1.img.xz')
> +        u_boot_utils.run_and_log(
> +            cons,
> +            ['sh', '-c', 'xz -dc %s >%s' % (infname, fname)])
> +
> +
>   @pytest.mark.buildconfigspec('ut_dm')
>   def test_ut_dm_init(u_boot_console):
>       """Initialize data for ut dm tests."""
> @@ -21,6 +114,16 @@ def test_ut_dm_init(u_boot_console):
>           with open(fn, 'wb') as fh:
>               fh.write(data)
>
> +@pytest.mark.buildconfigspec('cmd_bootflow')
> +def test_ut_dm_init_bootstd(u_boot_console):
> +    """Initialise data for bootflow tests"""
> +
> +    setup_bootflow_image(u_boot_console)
> +
> +    # Restart so that the new mmc1.img is picked up
> +    u_boot_console.restart_uboot()
> +
> +
>   def test_ut(u_boot_console, ut_subtest):
>       """Execute a "ut" subtest.
>