| Message ID | 20241105160926.393852-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests/functional: Fix the ppc64_hv and the ppc_40p test for read-only assets | expand |
On Wed Nov 6, 2024 at 2:09 AM AEST, Thomas Huth wrote: > Since commit 786bc2255256, cached asset files are read-only, so now we've > got to use "read-only=true" in tests that try to use these files directly. > > Fixes: 786bc22552 ("tests/functional: make cached asset files read-only") > Signed-off-by: Thomas Huth <thuth@redhat.com> LGTM Reviewed-by: Nicholas Piggin <npiggin@gmail.com> > --- > tests/functional/test_ppc64_hv.py | 3 ++- > tests/functional/test_ppc_40p.py | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc64_hv.py > index 1a6e4b6d07..312248bbfe 100755 > --- a/tests/functional/test_ppc64_hv.py > +++ b/tests/functional/test_ppc64_hv.py > @@ -99,7 +99,8 @@ def do_start_alpine(self): > self.vm.add_args("-kernel", self.vmlinuz) > self.vm.add_args("-initrd", self.initramfs) > self.vm.add_args("-smp", "4", "-m", "2g") > - self.vm.add_args("-drive", f"file={self.iso_path},format=raw,if=none,id=drive0") > + self.vm.add_args("-drive", f"file={self.iso_path},format=raw,if=none," > + "id=drive0,read-only=true") > > self.vm.launch() > wait_for_console_pattern(self, 'Welcome to Alpine Linux 3.18') > diff --git a/tests/functional/test_ppc_40p.py b/tests/functional/test_ppc_40p.py > index c64e876c1f..67bcdae53a 100755 > --- a/tests/functional/test_ppc_40p.py > +++ b/tests/functional/test_ppc_40p.py > @@ -46,7 +46,8 @@ def test_factory_firmware_and_netbsd(self): > > self.vm.set_console() > self.vm.add_args('-bios', bios_path, > - '-fda', drive_path) > + '-drive', > + f"file={drive_path},format=raw,if=floppy,read-only=true") > self.vm.launch() > os_banner = 'NetBSD 4.0 (GENERIC) #0: Sun Dec 16 00:49:40 PST 2007' > wait_for_console_pattern(self, os_banner)
diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc64_hv.py index 1a6e4b6d07..312248bbfe 100755 --- a/tests/functional/test_ppc64_hv.py +++ b/tests/functional/test_ppc64_hv.py @@ -99,7 +99,8 @@ def do_start_alpine(self): self.vm.add_args("-kernel", self.vmlinuz) self.vm.add_args("-initrd", self.initramfs) self.vm.add_args("-smp", "4", "-m", "2g") - self.vm.add_args("-drive", f"file={self.iso_path},format=raw,if=none,id=drive0") + self.vm.add_args("-drive", f"file={self.iso_path},format=raw,if=none," + "id=drive0,read-only=true") self.vm.launch() wait_for_console_pattern(self, 'Welcome to Alpine Linux 3.18') diff --git a/tests/functional/test_ppc_40p.py b/tests/functional/test_ppc_40p.py index c64e876c1f..67bcdae53a 100755 --- a/tests/functional/test_ppc_40p.py +++ b/tests/functional/test_ppc_40p.py @@ -46,7 +46,8 @@ def test_factory_firmware_and_netbsd(self): self.vm.set_console() self.vm.add_args('-bios', bios_path, - '-fda', drive_path) + '-drive', + f"file={drive_path},format=raw,if=floppy,read-only=true") self.vm.launch() os_banner = 'NetBSD 4.0 (GENERIC) #0: Sun Dec 16 00:49:40 PST 2007' wait_for_console_pattern(self, os_banner)
Since commit 786bc2255256, cached asset files are read-only, so now we've got to use "read-only=true" in tests that try to use these files directly. Fixes: 786bc22552 ("tests/functional: make cached asset files read-only") Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/functional/test_ppc64_hv.py | 3 ++- tests/functional/test_ppc_40p.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)