test: Convert test_xxd to use FsHelper

Simplify this test by using the helper.

Signed-off-by: Simon Glass <sjg@chromium.org>

test/py/tests/test_xxd.py

@@ -4,8 +4,7 @@
 """
 
 import pytest
-from subprocess import call, check_call, CalledProcessError
-from tests import fs_helper
+from tests.fs_helper import FsHelper
 
 @pytest.mark.boardspec('sandbox')
 @pytest.mark.buildconfigspec('cmd_xxd')
@@ -15,26 +14,13 @@ def test_xxd(ubman):
     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'])
+    with FsHelper(ubman.config, 'vfat', 1, 'test_xxd') as fsh:
+        with open(f'{fsh.srcdir}/hello', 'w', encoding = 'ascii') as outf:
+            outf.write('hello world\n\x00\x01\x02\x03\x04\x05')
+        fsh.mk_fs()
+        response = ubman.run_command_list([f'host bind 0 {fsh.fs_img}',
+                                           '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)