GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-07-05 13:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: vboot: Parameterise the test

Browse source 
This test is actually made up of five separate tests. Split them out so
that they appear as separate tests.

Unfortunately this restarts U-Boot multiple times which adds about a
second to the already-long vboot test, about 8 seconds total on my
machine. We could add a special 'teardown' test afterwards but if the
tests are executed out of order that would not work.

Changing test_vboot into a class causes it not to be discovered and makes
it different from all other tests.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-03-18 11:44:00 -06:00
parent c021971e13
commit 1b09003202
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
test/py/tests/test_vboot.py
View file

@ -30,13 +30,22 @@ import struct
import u_boot_utils as util import u_boot_utils as util
import vboot_forge import vboot_forge
TESTDATA = [
['sha1', '', False],
['sha1', '-pss', False],
['sha256', '', False],
['sha256', '-pss', False],
['sha256', '-pss', True],
]
@pytest.mark.boardspec('sandbox') @pytest.mark.boardspec('sandbox')
@pytest.mark.buildconfigspec('fit_signature') @pytest.mark.buildconfigspec('fit_signature')
@pytest.mark.requiredtool('dtc') @pytest.mark.requiredtool('dtc')
@pytest.mark.requiredtool('fdtget') @pytest.mark.requiredtool('fdtget')
@pytest.mark.requiredtool('fdtput') @pytest.mark.requiredtool('fdtput')
@pytest.mark.requiredtool('openssl') @pytest.mark.requiredtool('openssl')
def test_vboot(u_boot_console): @pytest.mark.parametrize("sha_algo,padding,required", TESTDATA)
def test_vboot(u_boot_console, sha_algo, padding, required):
"""Test verified boot signing with mkimage and verification with 'bootm'. """Test verified boot signing with mkimage and verification with 'bootm'.
This works using sandbox only as it needs to update the device tree used This works using sandbox only as it needs to update the device tree used
@ -297,11 +306,10 @@ def test_vboot(u_boot_console):
# afterwards. # afterwards.
old_dtb = cons.config.dtb old_dtb = cons.config.dtb
cons.config.dtb = dtb cons.config.dtb = dtb
test_with_algo('sha1','') if required:
test_with_algo('sha1','-pss') test_required_key(sha_algo, padding)
test_with_algo('sha256','') else:
test_with_algo('sha256','-pss') test_with_algo(sha_algo, padding)
test_required_key('sha256','-pss')
finally: finally:
# Go back to the original U-Boot with the correct dtb. # Go back to the original U-Boot with the correct dtb.
cons.config.dtb = old_dtb cons.config.dtb = old_dtb