smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Drop double removal of the FS image on failure

Browse Source 
We already have a cleanup function which removes the filesystem, so drop
the unnecessary try...except for this. It results in an error on the
error path, as we try to remove the filesystem twice.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-08-02 23:34:02 +12:00
parent 37632e0ff4
commit 70fa14e7fa
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/py/tests/fs_helper.py
View File

@@ -116,25 +116,21 @@ class FsHelper:
fsi.truncate(self.size_mb << 20)
self._do_cleanup = True
try:
mkfs_opt, fs_lnxtype = self._get_fs_args()
check_call(f'mkfs.{fs_lnxtype} {mkfs_opt} {fs_img}', shell=True,
stdout=DEVNULL if self.quiet else None)
mkfs_opt, fs_lnxtype = self._get_fs_args()
check_call(f'mkfs.{fs_lnxtype} {mkfs_opt} {fs_img}', shell=True,
stdout=DEVNULL if self.quiet else None)
if self.fs_type.startswith('ext'):
sb_content = check_output(f'tune2fs -l {fs_img}',
shell=True).decode()
if 'metadata_csum' in sb_content:
check_call(f'tune2fs -O ^metadata_csum {fs_img}', shell=True)
elif fs_lnxtype == 'exfat':
check_call(f'fattools cp {self.srcdir}/* {fs_img}', shell=True)
elif self.srcdir and os.listdir(self.srcdir):
flags = f"-smpQ{'' if self.quiet else 'v'}"
check_call(f'mcopy -i {fs_img} {flags} {self.srcdir}/* ::/',
shell=True)
except CalledProcessError:
os.remove(fs_img)
raise
if self.fs_type.startswith('ext'):
sb_content = check_output(f'tune2fs -l {fs_img}',
shell=True).decode()
if 'metadata_csum' in sb_content:
check_call(f'tune2fs -O ^metadata_csum {fs_img}', shell=True)
elif fs_lnxtype == 'exfat':
check_call(f'fattools cp {self.srcdir}/* {fs_img}', shell=True)
elif self.srcdir and os.listdir(self.srcdir):
flags = f"-smpQ{'' if self.quiet else 'v'}"
check_call(f'mcopy -i {fs_img} {flags} {self.srcdir}/* ::/',
shell=True)
def setup(self):
"""Set up the srcdir ready to receive files"""