mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-04-20 11:29:54 +00:00
arm/oeqa: Make ts-service-test config match selected SPs
Split tests to groups, and enable groups based on machine features set. This allows limiting tests to testing deployed SPs only. Signed-off-by: Anton Antonov <Anton.Antonov@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
@@ -3,25 +3,23 @@
|
||||
from oeqa.runtime.case import OERuntimeTestCase
|
||||
from oeqa.core.decorator.depends import OETestDepends
|
||||
from oeqa.runtime.decorator.package import OEHasPackage
|
||||
from oeqa.core.decorator.data import skipIfNotInDataVar
|
||||
|
||||
class TrustedServicesTest(OERuntimeTestCase):
|
||||
|
||||
def run_test_tool(self, cmd, expected_status=0 ):
|
||||
def run_test_tool(self, cmd, expected_status=0, expected_output=None ):
|
||||
""" Run a test utility """
|
||||
|
||||
status, output = self.target.run(cmd)
|
||||
self.assertEqual(status, expected_status, msg='\n'.join([cmd, output]))
|
||||
if expected_output is not None:
|
||||
self.assertEqual(output, expected_output, msg='\n'.join([cmd, output]))
|
||||
|
||||
@OEHasPackage(['ts-demo'])
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_00_ts_demo(self):
|
||||
self.run_test_tool('ts-demo')
|
||||
|
||||
@OEHasPackage(['ts-service-test'])
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_01_ts_service_test(self):
|
||||
self.run_test_tool('ts-service-test')
|
||||
|
||||
@OEHasPackage(['ts-uefi-test'])
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_02_ts_uefi_test(self):
|
||||
@@ -30,7 +28,8 @@ class TrustedServicesTest(OERuntimeTestCase):
|
||||
@OEHasPackage(['ts-psa-crypto-api-test'])
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_03_psa_crypto_api_test(self):
|
||||
# There are a few expected PSA Crypto tests failing
|
||||
# There are a two expected PSA Crypto tests failures testing features
|
||||
# TS will not support.
|
||||
self.run_test_tool('psa-crypto-api-test', expected_status=46)
|
||||
|
||||
@OEHasPackage(['ts-psa-its-api-test'])
|
||||
@@ -48,3 +47,68 @@ class TrustedServicesTest(OERuntimeTestCase):
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_06_psa_iat_api_test(self):
|
||||
self.run_test_tool('psa-iat-api-test')
|
||||
|
||||
@OEHasPackage(['ts-service-test'])
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_09_ts_service_grp_check(self):
|
||||
# If this test fails, available test groups in ts-service-test have changed and all
|
||||
# tests using the test executable need to be double checked to ensure test group to
|
||||
# TS SP mapping is still valid.
|
||||
test_grp_list="FwuServiceTests PsServiceTests ItsServiceTests AttestationProvisioningTests"
|
||||
test_grp_list+=" AttestationServiceTests CryptoKeyDerivationServicePackedcTests"
|
||||
test_grp_list+=" CryptoMacServicePackedcTests CryptoCipherServicePackedcTests"
|
||||
test_grp_list+=" CryptoHashServicePackedcTests CryptoServicePackedcTests"
|
||||
test_grp_list+=" CryptoServiceProtobufTests CryptoServiceLimitTests"
|
||||
test_grp_list+=" DiscoveryServiceTests"
|
||||
self.run_test_tool('ts-service-test -lg', expected_output=test_grp_list)
|
||||
|
||||
@OEHasPackage(['ts-service-test'])
|
||||
@skipIfNotInDataVar('MACHINE_FEATURES', 'ts-fwu', 'FWU SP is not included')
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_10_fwu_service_tests(self):
|
||||
self.run_test_tool('ts-service-test -g FwuServiceTests')
|
||||
|
||||
@OEHasPackage(['ts-service-test'])
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_11_ps_service_tests(self):
|
||||
if 'ts-storage' not in self.tc.td['MACHINE_FEATURES'] and \
|
||||
'ts-se-proxy' not in self.tc.td['MACHINE_FEATURES']:
|
||||
self.skipTest('Storage SP is not included into OPTEE')
|
||||
self.run_test_tool('ts-service-test -g PsServiceTests')
|
||||
|
||||
@OEHasPackage(['ts-service-test'])
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_12_its_service_tests(self):
|
||||
if 'ts-its' not in self.tc.td['MACHINE_FEATURES'] and \
|
||||
'ts-se-proxy' not in self.tc.td['MACHINE_FEATURES']:
|
||||
self.skipTest('Internal Storage SP is not included into OPTEE')
|
||||
self.run_test_tool('ts-service-test -g ItsServiceTests')
|
||||
|
||||
@OEHasPackage(['ts-service-test'])
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_14_attestation_service_tests(self):
|
||||
if 'ts-attestation' not in self.tc.td['MACHINE_FEATURES'] and \
|
||||
'ts-se-proxy' not in self.tc.td['MACHINE_FEATURES']:
|
||||
self.skipTest('Attestation SP is not included into OPTEE')
|
||||
for grp in ["AttestationProvisioningTests", "AttestationServiceTests"]:
|
||||
self.run_test_tool('ts-service-test -g %s'%grp)
|
||||
|
||||
@OEHasPackage(['ts-service-test'])
|
||||
@skipIfNotInDataVar('MACHINE_FEATURES', 'ts-crypto', 'Crypto SP is not included')
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_15_crypto_service_tests(self):
|
||||
if 'ts-crypto' not in self.tc.td['MACHINE_FEATURES'] and \
|
||||
'ts-se-proxy' not in self.tc.td['MACHINE_FEATURES']:
|
||||
self.skipTest('Crypto SP is not included into OPTEE')
|
||||
for grp in ["CryptoKeyDerivationServicePackedcTests", "CryptoMacServicePackedcTests", \
|
||||
"CryptoCipherServicePackedcTests", "CryptoHashServicePackedcTests", \
|
||||
"CryptoServicePackedcTests", "CryptoServiceProtobufTests CryptoServiceLimitTests"]:
|
||||
self.run_test_tool('ts-service-test -g %s'%grp)
|
||||
|
||||
@OEHasPackage(['ts-service-test'])
|
||||
@OETestDepends(['ssh.SSHTest.test_ssh'])
|
||||
def test_16_discovery_service_test(self):
|
||||
if 'ts-crypto' not in self.tc.td['MACHINE_FEATURES'] and \
|
||||
'ts-se-proxy' not in self.tc.td['MACHINE_FEATURES']:
|
||||
self.skipTest('Crypto SP is not included into OPTEE')
|
||||
self.run_test_tool('ts-service-test -g DiscoveryServiceTests')
|
||||
|
||||
Reference in New Issue
Block a user