Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 07:17:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test/py: replace 'tpm2 init, startup, selftest' sequences

Browse source 
Instead of copy pasting the commands needed to start a TPM consisting
of:
- tpm init
- tpm startup TPM2_SU_CLEAR
- tpm2 self_test full
use the newly added 'autostart' which does the same thing and simplify
our python scripts

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Ilias Apalodimas 2023-06-07 12:18:11 +03:00
parent e663b2ff4b
commit 789ed27842
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
test/py/tests/test_tpm2.py
View file

@ -41,11 +41,9 @@ def force_init(u_boot_console, force=False):
skip_test = u_boot_console.config.env.get('env__tpm_device_test_skip', False) skip_test = u_boot_console.config.env.get('env__tpm_device_test_skip', False)
if skip_test: if skip_test:
pytest.skip('skip TPM device test') pytest.skip('skip TPM device test')
output = u_boot_console.run_command('tpm2 init') output = u_boot_console.run_command('tpm2 autostart')
if force or not 'Error' in output: if force or not 'Error' in output:
u_boot_console.run_command('echo --- start of init ---') u_boot_console.run_command('echo --- start of init ---')
u_boot_console.run_command('tpm2 startup TPM2_SU_CLEAR')
u_boot_console.run_command('tpm2 self_test full')
u_boot_console.run_command('tpm2 clear TPM2_RH_LOCKOUT') u_boot_console.run_command('tpm2 clear TPM2_RH_LOCKOUT')
output = u_boot_console.run_command('echo $?') output = u_boot_console.run_command('echo $?')
if not output.endswith('0'): if not output.endswith('0'):
@ -83,20 +81,13 @@ def tpm2_sandbox_init(u_boot_console):
This allows all tests to run in parallel, since no test depends on another. This allows all tests to run in parallel, since no test depends on another.
""" """
u_boot_console.restart_uboot() u_boot_console.restart_uboot()
u_boot_console.run_command('tpm2 init') u_boot_console.run_command('tpm2 autostart')
output = u_boot_console.run_command('echo $?') output = u_boot_console.run_command('echo $?')
assert output.endswith('0') assert output.endswith('0')
skip_test = u_boot_console.config.env.get('env__tpm_device_test_skip', False) skip_test = u_boot_console.config.env.get('env__tpm_device_test_skip', False)
if skip_test: if skip_test:
pytest.skip('skip TPM device test') pytest.skip('skip TPM device test')
u_boot_console.run_command('tpm2 startup TPM2_SU_CLEAR')
output = u_boot_console.run_command('echo $?')
assert output.endswith('0')
u_boot_console.run_command('tpm2 self_test full')
output = u_boot_console.run_command('echo $?')
assert output.endswith('0')
@pytest.mark.buildconfigspec('cmd_tpm_v2') @pytest.mark.buildconfigspec('cmd_tpm_v2')
def test_tpm2_sandbox_self_test_full(u_boot_console): def test_tpm2_sandbox_self_test_full(u_boot_console):