[PATCH] test/functional: Fix Aspeed buildroot tests

Cédric Le Goater posted 1 patch 2 weeks, 4 days ago
tests/functional/test_arm_aspeed.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] test/functional: Fix Aspeed buildroot tests
Posted by Cédric Le Goater 2 weeks, 4 days ago
Since commit 786bc2255256, cached asset files are read-only. Adjust
the QEMU command line for buildroot tests to reflect the new
constraint on the flash drive.

Fixes: f04cb2d00d5c ("tests/functional: Convert most Aspeed machine tests")
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 tests/functional/test_arm_aspeed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py
index 9761fc06a454..19853161b267 100644
--- a/tests/functional/test_arm_aspeed.py
+++ b/tests/functional/test_arm_aspeed.py
@@ -125,7 +125,7 @@ def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
     def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
         self.require_netdev('user')
         self.vm.set_console()
-        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
+        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw,read-only=true',
                          '-net', 'nic', '-net', 'user')
         self.vm.launch()
 
-- 
2.47.0


Re: [PATCH] test/functional: Fix Aspeed buildroot tests
Posted by Peter Maydell 2 weeks, 4 days ago
On Tue, 5 Nov 2024 at 13:23, Cédric Le Goater <clg@redhat.com> wrote:
>
> Since commit 786bc2255256, cached asset files are read-only. Adjust
> the QEMU command line for buildroot tests to reflect the new
> constraint on the flash drive.
>
> Fixes: f04cb2d00d5c ("tests/functional: Convert most Aspeed machine tests")
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>  tests/functional/test_arm_aspeed.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py
> index 9761fc06a454..19853161b267 100644
> --- a/tests/functional/test_arm_aspeed.py
> +++ b/tests/functional/test_arm_aspeed.py
> @@ -125,7 +125,7 @@ def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
>      def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
>          self.require_netdev('user')
>          self.vm.set_console()
> -        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
> +        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw,read-only=true',
>                           '-net', 'nic', '-net', 'user')

There are a couple of other places in this file where we add
a '-drive' option pointing to a file -- do they also need
read-only=true adding ?

thanks
-- PMM
Re: [PATCH] test/functional: Fix Aspeed buildroot tests
Posted by Cédric Le Goater 2 weeks, 4 days ago
On 11/5/24 15:38, Peter Maydell wrote:
> On Tue, 5 Nov 2024 at 13:23, Cédric Le Goater <clg@redhat.com> wrote:
>>
>> Since commit 786bc2255256, cached asset files are read-only. Adjust
>> the QEMU command line for buildroot tests to reflect the new
>> constraint on the flash drive.
>>
>> Fixes: f04cb2d00d5c ("tests/functional: Convert most Aspeed machine tests")
>> Suggested-by: Thomas Huth <thuth@redhat.com>
>> Signed-off-by: Cédric Le Goater <clg@redhat.com>
>> ---
>>   tests/functional/test_arm_aspeed.py | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py
>> index 9761fc06a454..19853161b267 100644
>> --- a/tests/functional/test_arm_aspeed.py
>> +++ b/tests/functional/test_arm_aspeed.py
>> @@ -125,7 +125,7 @@ def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
>>       def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
>>           self.require_netdev('user')
>>           self.vm.set_console()
>> -        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
>> +        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw,read-only=true',
>>                            '-net', 'nic', '-net', 'user')
> 
> There are a couple of other places in this file where we add
> a '-drive' option pointing to a file -- do they also need
> read-only=true adding ?

The other tests use an OpenBMC drive image which is modified at boot
and so they have a '-snapshot' option on the command line.

The buildroot drive image shouldn't be modified although 'rw' access
is required. I am not sure why.

Thanks,

C.





Re: [PATCH] test/functional: Fix Aspeed buildroot tests
Posted by Thomas Huth 2 weeks, 4 days ago
On 05/11/2024 15.38, Peter Maydell wrote:
> On Tue, 5 Nov 2024 at 13:23, Cédric Le Goater <clg@redhat.com> wrote:
>>
>> Since commit 786bc2255256, cached asset files are read-only. Adjust
>> the QEMU command line for buildroot tests to reflect the new
>> constraint on the flash drive.
>>
>> Fixes: f04cb2d00d5c ("tests/functional: Convert most Aspeed machine tests")
>> Suggested-by: Thomas Huth <thuth@redhat.com>
>> Signed-off-by: Cédric Le Goater <clg@redhat.com>
>> ---
>>   tests/functional/test_arm_aspeed.py | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py
>> index 9761fc06a454..19853161b267 100644
>> --- a/tests/functional/test_arm_aspeed.py
>> +++ b/tests/functional/test_arm_aspeed.py
>> @@ -125,7 +125,7 @@ def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
>>       def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
>>           self.require_netdev('user')
>>           self.vm.set_console()
>> -        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
>> +        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw,read-only=true',
>>                            '-net', 'nic', '-net', 'user')
> 
> There are a couple of other places in this file where we add
> a '-drive' option pointing to a file -- do they also need
> read-only=true adding ?

I'm seeing problems with the ppc64_hv and the ppc_40p tests, but fortunately 
they are hidden behind some @skipUnless decorators. I'm working on a patch...

  Thomas


Re: [PATCH] test/functional: Fix Aspeed buildroot tests
Posted by Thomas Huth 2 weeks, 4 days ago
On 05/11/2024 14.23, Cédric Le Goater wrote:
> Since commit 786bc2255256, cached asset files are read-only. Adjust
> the QEMU command line for buildroot tests to reflect the new
> constraint on the flash drive.
> 
> Fixes: f04cb2d00d5c ("tests/functional: Convert most Aspeed machine tests")
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>   tests/functional/test_arm_aspeed.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py
> index 9761fc06a454..19853161b267 100644
> --- a/tests/functional/test_arm_aspeed.py
> +++ b/tests/functional/test_arm_aspeed.py
> @@ -125,7 +125,7 @@ def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
>       def do_test_arm_aspeed_buildroot_start(self, image, cpu_id, pattern='Aspeed EVB'):
>           self.require_netdev('user')
>           self.vm.set_console()
> -        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
> +        self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw,read-only=true',
>                            '-net', 'nic', '-net', 'user')
>           self.vm.launch()
>   

Reviewed-by: Thomas Huth <thuth@redhat.com>