From: Thomas Huth <th...@redhat.com> In case the default machine has not been compiled into the QEMU binary, the vnc and the cpu_hotplug_props test are currently failing. Add a set_machine('pc') here to make sure that the tests are correctly skipped in case the machine is not available.
Signed-off-by: Thomas Huth <th...@redhat.com> --- tests/functional/test_pc_cpu_hotplug_props.py | 1 + tests/functional/test_vnc.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tests/functional/test_pc_cpu_hotplug_props.py b/tests/functional/test_pc_cpu_hotplug_props.py index 9d5a37cb170..2bed8ada023 100755 --- a/tests/functional/test_pc_cpu_hotplug_props.py +++ b/tests/functional/test_pc_cpu_hotplug_props.py @@ -26,6 +26,7 @@ class OmittedCPUProps(QemuSystemTest): def test_no_die_id(self): + self.set_machine('pc') self.vm.add_args('-nodefaults', '-S') self.vm.add_args('-smp', '1,sockets=2,cores=2,threads=2,maxcpus=8') self.vm.add_args('-device', 'qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0') diff --git a/tests/functional/test_vnc.py b/tests/functional/test_vnc.py index 5c0ee5f9272..cbb01f00c7b 100755 --- a/tests/functional/test_vnc.py +++ b/tests/functional/test_vnc.py @@ -31,6 +31,7 @@ def check_connect(port: int) -> bool: class Vnc(QemuSystemTest): def test_no_vnc_change_password(self): + self.set_machine('pc') self.vm.add_args('-nodefaults', '-S') self.vm.launch() @@ -62,6 +63,7 @@ def launch_guarded(self): raise excp def test_change_password_requires_a_password(self): + self.set_machine('pc') self.vm.add_args('-nodefaults', '-S', '-vnc', ':1,to=999') self.launch_guarded() self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled']) @@ -74,6 +76,7 @@ def test_change_password_requires_a_password(self): 'Could not set password') def test_change_password(self): + self.set_machine('pc') self.vm.add_args('-nodefaults', '-S', '-vnc', ':1,to=999,password=on') self.launch_guarded() self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled']) @@ -103,6 +106,7 @@ def do_test_change_listen(self, a, b, c): self.assertTrue(check_connect(c)) def test_change_listen(self): + self.set_machine('pc') with Ports() as ports: a, b, c = ports.find_free_ports(3) self.do_test_change_listen(a, b, c) -- 2.49.0