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

test/py/tests/test_bootstage.py: Combine stash/unstash tests

Browse Source 
When running the bootstage tests currently we get a warning like:
tests/test_bootstage.py::test_bootstage_stash
...PytestReturnNotNoneWarning: Expected None, but tests/test_bootstage.py::test_bootstage_stash returned (37748736, 4096), which will be an error in a future version of pytest.  Did you mean to use `assert` in stead of `return`?

This is because the unstash test will run the stash test and fetch the
addr / size from that. Rework the test to be stash and unstash and then
run the unstash command at the end of the current stash test.

Acked-by: Michal Simek <michal.simek@amd.com>
Reviewed-by: Love Kumar <love.kumar@amd.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2024-08-28 16:56:10 -06:00
parent ab50741121
commit 8a5ef6effb
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/py/tests/test_bootstage.py
View File

@@ -33,7 +33,7 @@ def test_bootstage_report(u_boot_console):
@pytest.mark.buildconfigspec('bootstage') @pytest.mark.buildconfigspec('bootstage')
@pytest.mark.buildconfigspec('cmd_bootstage') @pytest.mark.buildconfigspec('cmd_bootstage')
@pytest.mark.buildconfigspec('bootstage_stash') @pytest.mark.buildconfigspec('bootstage_stash')
def test_bootstage_stash(u_boot_console): def test_bootstage_stash_and_unstash(u_boot_console):
f = u_boot_console.config.env.get('env__bootstage_cmd_file', None) f = u_boot_console.config.env.get('env__bootstage_cmd_file', None)
if not f: if not f:
pytest.skip('No bootstage environment file is defined') pytest.skip('No bootstage environment file is defined')
@@ -55,13 +55,8 @@ def test_bootstage_stash(u_boot_console):
# Check expected string in last column of output # Check expected string in last column of output
output_last_col = ''.join([i.split()[-1] for i in output.split('\n')]) output_last_col = ''.join([i.split()[-1] for i in output.split('\n')])
assert expected_text in output_last_col assert expected_text in output_last_col
return addr, size
@pytest.mark.buildconfigspec('bootstage') # Check that unstash works as expected
@pytest.mark.buildconfigspec('cmd_bootstage')
@pytest.mark.buildconfigspec('bootstage_stash')
def test_bootstage_unstash(u_boot_console):
addr, size = test_bootstage_stash(u_boot_console)
u_boot_console.run_command('bootstage unstash %x %x' % (addr, size)) u_boot_console.run_command('bootstage unstash %x %x' % (addr, size))
output = u_boot_console.run_command('echo $?') output = u_boot_console.run_command('echo $?')
assert output.endswith('0') assert output.endswith('0')