Re: [PATCH v2] tests/functional: Convert Aarch64 SBSA-Ref avocado tests

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

On 22/8/24 20:48, Marcin Juszkiewicz wrote:
> On 22.08.2024 13:41, Philippe Mathieu-Daudé wrote:
>> Straight forward conversion. Since SBSA_FLASH files are not
>> tarballs, use lzma_uncompress() method.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>> Based-on: <20240821082748.65853-1-thuth@redhat.com>
>> ---
> 
>> diff --git a/tests/avocado/machine_aarch64_sbsaref.py 
>> b/tests/functional/test_aarch64_sbsaref.py
>> old mode 100644
>> new mode 100755
>> similarity index 56%
>> rename from tests/avocado/machine_aarch64_sbsaref.py
>> rename to tests/functional/test_aarch64_sbsaref.py
>> index f8bf40c192..6728e5f92a
>> --- a/tests/avocado/machine_aarch64_sbsaref.py
>> +++ b/tests/functional/test_aarch64_sbsaref.py
> 
>> @@ -44,47 +55,31 @@ def fetch_firmware(self):
>>           """
>>           # Secure BootRom (TF-A code)
>> -        fs0_xz_url = (
>> -            
>> "https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
>> -            "20240619-148232/edk2/SBSA_FLASH0.fd.xz"
>> -        )
>> -        fs0_xz_hash = 
>> "0c954842a590988f526984de22e21ae0ab9cb351a0c99a8a58e928f0c7359cf7"
>> -        tar_xz_path = self.fetch_asset(fs0_xz_url, 
>> asset_hash=fs0_xz_hash,
>> -                                      algorithm='sha256')
>> -        archive.extract(tar_xz_path, self.workdir)
>> +        fs0_xz_path = self.ASSET_FLASH0.fetch()
>>           fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd")
>> +        lzma_uncompress(fs0_xz_path, fs0_path)
>>           # Non-secure rom (UEFI and EFI variables)
>> -        fs1_xz_url = (
>> -            
>> "https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/"
>> -            "20240619-148232/edk2/SBSA_FLASH1.fd.xz"
>> -        )
>> -        fs1_xz_hash = 
>> "c6ec39374c4d79bb9e9cdeeb6db44732d90bb4a334cec92002b3f4b9cac4b5ee"
>> -        tar_xz_path = self.fetch_asset(fs1_xz_url, 
>> asset_hash=fs1_xz_hash,
>> -                                      algorithm='sha256')
>> -        archive.extract(tar_xz_path, self.workdir)
>> +        fs1_xz_path = self.ASSET_FLASH0.fetch()
> 
> Here you want ASSET_FLASH1 not ASSET_FLASH0. That's why it timed out - 
> system was hanging on exit from TF-A to EDK2.

Oops... Thanks you for debugging / noticing this!

> 
>>           fs1_path = os.path.join(self.workdir, "SBSA_FLASH1.fd")
>> +        lzma_uncompress(fs1_xz_path, fs1_path)
>