From 0c24edd56ac2553f2cb7d146b40a03d33ef8984b Mon Sep 17 00:00:00 2001 From: gabor-mezei-arm Date: Tue, 29 Jun 2021 15:42:57 +0200 Subject: [PATCH] Return iterator instead of list Signed-off-by: gabor-mezei-arm --- tests/scripts/generate_psa_tests.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/scripts/generate_psa_tests.py b/tests/scripts/generate_psa_tests.py index 0c10fd6ffd..97130ea60c 100755 --- a/tests/scripts/generate_psa_tests.py +++ b/tests/scripts/generate_psa_tests.py @@ -482,14 +482,12 @@ class StorageFormat: for alg in self.constructors.generate_expressions(algorithms): yield from self.keys_for_algorithm(alg) - def generate_all_keys(self) -> List[StorageTestData]: + def generate_all_keys(self) -> Iterator[StorageTestData]: """Generate all keys for the test cases.""" - keys = [] #type: List[StorageTestData] - keys += self.all_keys_for_lifetimes() - keys += self.all_keys_for_usage_flags() - keys += self.all_keys_for_types() - keys += self.all_keys_for_algorithms() - return keys + yield from self.all_keys_for_lifetimes() + yield from self.all_keys_for_usage_flags() + yield from self.all_keys_for_types() + yield from self.all_keys_for_algorithms() def all_test_cases(self) -> Iterator[test_case.TestCase]: """Generate all storage format test cases.""" @@ -621,10 +619,9 @@ class StorageFormatV0(StorageFormat): if kt.is_valid_for_signature(usage): yield self.keys_for_implicit_usage(usage, alg, kt) - def generate_all_keys(self) -> List[StorageTestData]: - keys = super().generate_all_keys() - keys += self.all_keys_for_implicit_usage() - return keys + def generate_all_keys(self) -> Iterator[StorageTestData]: + yield from super().generate_all_keys() + yield from self.all_keys_for_implicit_usage() class TestGenerator: """Generate test data."""