aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2024-12-18 14:14:35 +0100
committerThomas Huth <thuth@redhat.com>2025-01-02 07:44:28 +0100
commitc82bfaf42dc6f8dbf101190c86cfa8af9ea400fd (patch)
tree94128635c42c74fc342ed4ee499803be23c52001
parent3d5d015ca419edc122d7977c93bafaaca43307a4 (diff)
downloadqemu-c82bfaf42dc6f8dbf101190c86cfa8af9ea400fd.zip
qemu-c82bfaf42dc6f8dbf101190c86cfa8af9ea400fd.tar.gz
qemu-c82bfaf42dc6f8dbf101190c86cfa8af9ea400fd.tar.bz2
tests/functional: Convert the vnc test
Nothing thrilling in here, it's just a straight forward conversion. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20241218131439.255841-2-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--tests/functional/meson.build1
-rwxr-xr-x[-rw-r--r--]tests/functional/test_vnc.py (renamed from tests/avocado/vnc.py)12
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 24f7f8f..a5087fc 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -224,6 +224,7 @@ tests_x86_64_system_quick = [
'pc_cpu_hotplug_props',
'virtio_version',
'x86_cpu_model_versions',
+ 'vnc',
]
tests_x86_64_system_thorough = [
diff --git a/tests/avocado/vnc.py b/tests/functional/test_vnc.py
index 862c899..b769d3b 100644..100755
--- a/tests/avocado/vnc.py
+++ b/tests/functional/test_vnc.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+#
# Simple functional tests for VNC functionality
#
# Copyright (c) 2018 Red Hat, Inc.
@@ -11,7 +13,7 @@
import socket
from typing import List
-from avocado_qemu import QemuSystemTest
+from qemu_test import QemuSystemTest
VNC_ADDR = '127.0.0.1'
@@ -51,10 +53,7 @@ def find_free_ports(count: int) -> List[int]:
class Vnc(QemuSystemTest):
- """
- :avocado: tags=vnc,quick
- :avocado: tags=machine:none
- """
+
def test_no_vnc(self):
self.vm.add_args('-nodefaults', '-S')
self.vm.launch()
@@ -113,3 +112,6 @@ class Vnc(QemuSystemTest):
self.assertFalse(check_connect(a))
self.assertTrue(check_connect(b))
self.assertTrue(check_connect(c))
+
+if __name__ == '__main__':
+ QemuSystemTest.main()