From 34845926de3218cd2a35e38867049098161e5c3d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 6 May 2021 14:05:05 -0700 Subject: [PATCH] Use Vinagre instead of Boxes as VNC client Boxes dropped VNC functionality. It's supposed to be replaced by Connections, but we can't use that until it has fullscreen: https://gitlab.gnome.org/GNOME/connections/-/issues/5 so use Vinagre for now. Signed-off-by: Adam Williamson --- .../vnc/boxes_allow_inhibit-20200427.json | 6 +++-- .../vnc/boxes_fullscreen-20191105.json | 5 +++-- .../vnc/boxes_new_connection-20191105.json | 5 +++-- tests/_vnc_client_connect.pm | 22 +++++++++---------- tests/_vnc_client_connect_pre.pm | 3 +++ 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/needles/anaconda/vnc/boxes_allow_inhibit-20200427.json b/needles/anaconda/vnc/boxes_allow_inhibit-20200427.json index af5b14fe..2d9c7e87 100644 --- a/needles/anaconda/vnc/boxes_allow_inhibit-20200427.json +++ b/needles/anaconda/vnc/boxes_allow_inhibit-20200427.json @@ -10,6 +10,8 @@ ], "properties": [], "tags": [ - "boxes_allow_inhibit" + "boxes_allow_inhibit", + "connections_allow_inhibit", + "vinagre_allow_inhibit" ] -} \ No newline at end of file +} diff --git a/needles/anaconda/vnc/boxes_fullscreen-20191105.json b/needles/anaconda/vnc/boxes_fullscreen-20191105.json index 6e7522bd..e7fd30e9 100644 --- a/needles/anaconda/vnc/boxes_fullscreen-20191105.json +++ b/needles/anaconda/vnc/boxes_fullscreen-20191105.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ - "boxes_fullscreen" + "boxes_fullscreen", + "connections_fullscreen" ] -} \ No newline at end of file +} diff --git a/needles/anaconda/vnc/boxes_new_connection-20191105.json b/needles/anaconda/vnc/boxes_new_connection-20191105.json index 4b0298e2..68cd9d90 100644 --- a/needles/anaconda/vnc/boxes_new_connection-20191105.json +++ b/needles/anaconda/vnc/boxes_new_connection-20191105.json @@ -10,6 +10,7 @@ ], "properties": [], "tags": [ - "boxes_new_connection" + "boxes_new_connection", + "connections_new_connection" ] -} \ No newline at end of file +} diff --git a/tests/_vnc_client_connect.pm b/tests/_vnc_client_connect.pm index 4a674b56..ec499f8c 100644 --- a/tests/_vnc_client_connect.pm +++ b/tests/_vnc_client_connect.pm @@ -4,17 +4,17 @@ use testapi; use utils; sub run { - menu_launch_type('boxes'); - assert_screen ['apps_boxes_tutorial', 'boxes_new_connection']; - if (match_has_tag 'apps_boxes_tutorial') { - # Let us get rid of the Tutorial window. - send_key 'esc'; - } - assert_and_click('boxes_new_connection'); - assert_and_click('boxes_remote'); - type_very_safely("vnc://172.16.2.114:5901\n"); - assert_and_click('boxes_allow_inhibit'); - assert_and_click('boxes_fullscreen'); + menu_launch_type('vinagre'); + assert_and_click('vinagre_new_connection'); + assert_and_click('vinagre_protocol'); + assert_and_click('vinagre_protocol_vnc'); + send_key('tab'); + type_very_safely("172.16.2.114:5901\n"); + assert_and_click('vinagre_fullscreen'); + assert_and_click('vinagre_allow_inhibit'); + # allow for a stupid animation to happen + wait_still_screen 5; + assert_and_click('vinagre_enable_shortcuts'); } sub test_flags { diff --git a/tests/_vnc_client_connect_pre.pm b/tests/_vnc_client_connect_pre.pm index f39db083..19fa5219 100644 --- a/tests/_vnc_client_connect_pre.pm +++ b/tests/_vnc_client_connect_pre.pm @@ -11,6 +11,9 @@ sub run { setup_tap_static('172.16.2.115', 'vnc002.test.openqa.fedoraproject.org'); # test test: check if we can see the server assert_script_run "ping -c 2 172.16.2.114"; + # FIXME https://pagure.io/fedora-workstation/issue/231 - Boxes + # dropped VNC functionality, no default replacement yet + assert_script_run "dnf -y install vinagre"; desktop_vt; }