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

test/py: Rework how test_ums.py handles (not) having write enabled

Browse Source 
With a newer pylint version we get a warning about how mounted_test_fn
could be used before assignment. Evaluating the code, this can't happen
because we check for "not have_writable_fs_partition" and return before
moving to the part of the tests which use mounted_test_fn. However, we
should instead have this written so that we only try this part of the
test if have_writable_fs_partition is set, and this also fixes the
warning. As part of this we also move test_f and mounted_test_fn to the
section of code that already only does this if
have_writable_fs_partition is set.

Signed-off-by: Tom Rini <trini@konsulko.com>
(cherry picked from commit 203d3a9fc7)
This commit is contained in:
Simon Glass
2025-04-29 13:26:47 -06:00
parent 86d671a6af
commit ce2c7b7b7d
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/py/tests/test_ums.py
View File

@@ -113,14 +113,11 @@ def test_ums(ubman, env__usb_dev_port, env__block_devs):
mount_subdir = env__block_devs[0]['writable_fs_subdir']
part_num = env__block_devs[0]['writable_fs_partition']
host_ums_part_node = '%s-part%d' % (host_ums_dev_node, part_num)
test_f = utils.PersistentRandomFile(ubman, 'ums.bin', 1024 * 1024);
mounted_test_fn = mount_point + '/' + mount_subdir + test_f.fn
else:
host_ums_part_node = host_ums_dev_node
test_f = utils.PersistentRandomFile(ubman, 'ums.bin',
1024 * 1024);
if have_writable_fs_partition:
mounted_test_fn = mount_point + '/' + mount_subdir + test_f.fn
def start_ums():
"""Start U-Boot's ums shell command.
@@ -197,25 +194,23 @@ def test_ums(ubman, env__usb_dev_port, env__block_devs):
ignore_errors)
ignore_cleanup_errors = True
try:
start_ums()
if not have_writable_fs_partition:
# Skip filesystem-based testing if not configured
return
if have_writable_fs_partition:
try:
mount()
ubman.log.action('Writing test file via UMS')
cmd = ('rm', '-f', mounted_test_fn)
utils.run_and_log(ubman, cmd)
if os.path.exists(mounted_test_fn):
raise Exception('Could not rm target UMS test file')
cmd = ('cp', test_f.abs_fn, mounted_test_fn)
utils.run_and_log(ubman, cmd)
ignore_cleanup_errors = False
start_ums()
try:
mount()
ubman.log.action('Writing test file via UMS')
cmd = ('rm', '-f', mounted_test_fn)
utils.run_and_log(ubman, cmd)
if os.path.exists(mounted_test_fn):
raise Exception('Could not rm target UMS test file')
cmd = ('cp', test_f.abs_fn, mounted_test_fn)
utils.run_and_log(ubman, cmd)
ignore_cleanup_errors = False
finally:
umount(ignore_errors=ignore_cleanup_errors)
finally:
umount(ignore_errors=ignore_cleanup_errors)
finally:
stop_ums(ignore_errors=ignore_cleanup_errors)
stop_ums(ignore_errors=ignore_cleanup_errors)
ignore_cleanup_errors = True
try: