From: Tom Rini <trini@konsulko.com>
Date: Tue, 8 Apr 2025 19:54:50 +0000 (-0600)
Subject: Merge patch series "Improve pytest runtime"
X-Git-Tag: v2025.07-rc1~117
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a30b54462825843a9dcc46a17df6d57099f7b61a;p=pandora-u-boot.git

Merge patch series "Improve pytest runtime"

Tom Rini <trini@konsulko.com> says:

One thing that Simon Glass has noted is that our pytest run time keeps
getting longer. Looking at:
https://source.denx.de/u-boot/u-boot/-/pipelines/25011/test_report?job_name=sandbox%20test.py%3A%20%5Bfast%20amd64%5D
we can see that some of the longest running tests are a little puzzling.
It turns out that we have two ways of making filesystem images without
requiring root access and one of them is significantly slower than the
other. This series changes us from using virt-make-fs to only using the
mk_fs helper that currently resides in test_ut.py which uses standard
userspace tools. The final result can be seen at:
https://source.denx.de/u-boot/u-boot/-/pipelines/25015/test_report?job_name=sandbox%20test.py%3A%20%5Bfast%20amd64%5D
and the tests changed here now run much quicker.

Link: https://lore.kernel.org/r/20250320140030.2052434-1-trini@konsulko.com
---

a30b54462825843a9dcc46a17df6d57099f7b61a
diff --cc test/py/tests/test_ut.py
index b8adb597e11,3a3f12d0898..cdf54adc600
--- a/test/py/tests/test_ut.py
+++ b/test/py/tests/test_ut.py
@@@ -27,47 -27,6 +27,17 @@@ def mkdir_cond(dirname)
      if not os.path.exists(dirname):
          os.mkdir(dirname)
  
- def setup_image(ubman, devnum, part_type, img_size=20, second_part=False,
-                 basename='mmc'):
-     """Create a disk image with a single partition
- 
-     Args:
-         ubman (ConsoleBase): Console to use
-         devnum (int): Device number to use, e.g. 1
-         part_type (int): Partition type, e.g. 0xc for FAT32
-         img_size (int): Image size in MiB
-         second_part (bool): True to contain a small second partition
-         basename (str): Base name to use in the filename, e.g. 'mmc'
- 
-     Returns:
-         tuple:
-             str: Filename of MMC image
-             str: Directory name of scratch directory
-     """
-     fname = os.path.join(ubman.config.source_dir, f'{basename}{devnum}.img')
-     mnt = os.path.join(ubman.config.persistent_data_dir, 'scratch')
-     mkdir_cond(mnt)
- 
-     spec = f'type={part_type:x}, size={img_size - 2}M, start=1M, bootable'
-     if second_part:
-         spec += '\ntype=c'
- 
-     utils.run_and_log(ubman, f'qemu-img create {fname} 20M')
-     utils.run_and_log(ubman, f'sfdisk {fname}',
-                              stdin=spec.encode('utf-8'))
-     return fname, mnt
- 
 +def copy_partition(ubman, fsfile, outname):
 +    """Copy a partition into a disk iamge
 +
 +    Args:
 +        ubman (ConsoleBase): U-Boot fixture
 +        fsfile (str): Name of partition file
 +        outname (str): Name of full-disk file to update
 +    """
 +    utils.run_and_log(ubman,
 +                      f'dd if={fsfile} of={outname} bs=1M seek=1 conv=notrunc')
 +
  def setup_bootmenu_image(ubman):
      """Create a 20MB disk image with a single ext4 partition