test/py: Rework test_xxd to not use virt-make-fs

The problem with using "virt-make-fs" to make a filesystem image is that
it is extremely slow. Switch to using the fs_helper functions we have
instead from the filesystem tests as these can add files to images and
are significantly faster and still do not require root access.

Signed-off-by: Tom Rini <trini@konsulko.com>

test/py/tests/test_xxd.py

@@ -0,0 +1,40 @@
+# SPDX-License-Identifier:      GPL-2.0+
+
+""" Unit test for xxd command
+"""
+
+import pytest
+from subprocess import call, check_call, CalledProcessError
+from tests import fs_helper
+
+@pytest.mark.boardspec('sandbox')
+@pytest.mark.buildconfigspec('cmd_xxd')
+def test_xxd(ubman):
+    """ Unit test for xxd
+
+    Args:
+        ubman -- U-Boot console
+    """
+    try:
+        scratch_dir = ubman.config.persistent_data_dir + '/scratch'
+
+        check_call('mkdir -p %s' % scratch_dir, shell=True)
+
+        with open(scratch_dir + '/hello', 'w', encoding = 'ascii') as file:
+            file.write('hello world\n\x00\x01\x02\x03\x04\x05')
+
+        xxd_data = fs_helper.mk_fs(ubman.config, 'vfat', 0x100000,
+                                   'test_xxd', scratch_dir)
+        response = ubman.run_command_list([ f'host bind 0 {xxd_data}',
+                                                    'xxd host 0 hello'])
+
+        assert '00000000: 68 65 6c 6c 6f 20 77 6f 72 6c 64 0a 00 01 02 03  hello world.....\r\r\n' + \
+               '00000010: 04 05                                            ..' \
+               in response
+    except CalledProcessError as err:
+        pytest.skip('Preparing test_xxd image failed')
+        call('rm -f %s' % xxd_data, shell=True)
+        return
+    finally:
+        call('rm -rf %s' % scratch_dir, shell=True)
+        call('rm -f %s' % xxd_data, shell=True)

test/py/tests/test_xxd/conftest.py

@@ -1,36 +0,0 @@
-# SPDX-License-Identifier:      GPL-2.0+
-
-"""Fixture for xxd command test
-"""
-
-import os
-import shutil
-from subprocess import check_call, CalledProcessError
-import pytest
-
-@pytest.fixture(scope='session')
-def xxd_data(u_boot_config):
-    """Set up a file system to be used in xxd tests
-
-    Args:
-        u_boot_config -- U-Boot configuration.
-    """
-    mnt_point = u_boot_config.persistent_data_dir + '/test_xxd'
-    image_path = u_boot_config.persistent_data_dir + '/xxd.img'
-
-    try:
-        os.mkdir(mnt_point, mode = 0o755)
-
-        with open(mnt_point + '/hello', 'w', encoding = 'ascii') as file:
-            file.write('hello world\n\x00\x01\x02\x03\x04\x05')
-
-        check_call(f'virt-make-fs --partition=gpt --size=+1M --type=vfat {mnt_point} {image_path}',
-                   shell=True)
-
-        yield image_path
-    except CalledProcessError:
-        pytest.skip('Setup failed')
-    finally:
-        shutil.rmtree(mnt_point)
-        if os.path.exists(image_path):
-            os.remove(image_path)

test/py/tests/test_xxd/test_xxd.py

@@ -1,23 +0,0 @@
-# SPDX-License-Identifier:      GPL-2.0+
-
-""" Unit test for xxd command
-"""
-
-import pytest
-
-@pytest.mark.boardspec('sandbox')
-@pytest.mark.buildconfigspec('cmd_xxd')
-def test_xxd(ubman, xxd_data):
-    """ Unit test for xxd
-
-    Args:
-        ubman -- U-Boot console
-        xxd_data -- Path to the disk image used for testing.
-    """
-    response = ubman.run_command_list([
-        f'host bind 0 {xxd_data}',
-        'xxd host 0 hello'])
-
-    assert '00000000: 68 65 6c 6c 6f 20 77 6f 72 6c 64 0a 00 01 02 03  hello world.....\r\r\n' + \
-           '00000010: 04 05                                            ..' \
-           in response