Skip to content

Commit c82bfaf

Browse files
committed
tests/functional: Convert the vnc test
Nothing thrilling in here, it's just a straight forward conversion. Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Tested-by: Philippe Mathieu-Daudé <[email protected]> Message-ID: <[email protected]> Signed-off-by: Thomas Huth <[email protected]>
1 parent 3d5d015 commit c82bfaf

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

tests/functional/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ tests_x86_64_system_quick = [
224224
'pc_cpu_hotplug_props',
225225
'virtio_version',
226226
'x86_cpu_model_versions',
227+
'vnc',
227228
]
228229

229230
tests_x86_64_system_thorough = [

tests/avocado/vnc.py renamed to tests/functional/test_vnc.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env python3
2+
#
13
# Simple functional tests for VNC functionality
24
#
35
# Copyright (c) 2018 Red Hat, Inc.
@@ -11,7 +13,7 @@
1113
import socket
1214
from typing import List
1315

14-
from avocado_qemu import QemuSystemTest
16+
from qemu_test import QemuSystemTest
1517

1618

1719
VNC_ADDR = '127.0.0.1'
@@ -51,10 +53,7 @@ def find_free_ports(count: int) -> List[int]:
5153

5254

5355
class Vnc(QemuSystemTest):
54-
"""
55-
:avocado: tags=vnc,quick
56-
:avocado: tags=machine:none
57-
"""
56+
5857
def test_no_vnc(self):
5958
self.vm.add_args('-nodefaults', '-S')
6059
self.vm.launch()
@@ -113,3 +112,6 @@ def test_change_listen(self):
113112
self.assertFalse(check_connect(a))
114113
self.assertTrue(check_connect(b))
115114
self.assertTrue(check_connect(c))
115+
116+
if __name__ == '__main__':
117+
QemuSystemTest.main()

0 commit comments

Comments
 (0)