Use Vinagre instead of Boxes as VNC client, prepare Connections

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. We do also prepare some needles for
Connections in anticipation of being able to use it later (since
I already did the work and don't want to waste it...)

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-05-06 14:05:05 -07:00
parent a4867ebe76
commit 35660bb4ed
19 changed files with 114 additions and 32 deletions

View File

@ -10,6 +10,8 @@
], ],
"properties": [], "properties": [],
"tags": [ "tags": [
"boxes_allow_inhibit" "boxes_allow_inhibit",
"connections_allow_inhibit",
"vinagre_allow_inhibit"
] ]
} }

View File

@ -10,6 +10,7 @@
], ],
"properties": [], "properties": [],
"tags": [ "tags": [
"boxes_fullscreen" "boxes_fullscreen",
"connections_fullscreen"
] ]
} }

View File

@ -10,6 +10,7 @@
], ],
"properties": [], "properties": [],
"tags": [ "tags": [
"boxes_new_connection" "boxes_new_connection",
"connections_new_connection"
] ]
} }

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 115,
"ypos": 130,
"width": 50,
"height": 15,
"type": "match"
}
],
"properties": [],
"tags": [
"boxes_remote"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

View File

@ -0,0 +1,15 @@
{
"area": [
{
"xpos": 103,
"ypos": 156,
"width": 24,
"height": 30,
"type": "match"
}
],
"properties": [],
"tags": [
"connections_connect"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,15 @@
{
"area": [
{
"xpos": 605,
"ypos": 213,
"width": 116,
"height": 16,
"type": "match"
}
],
"properties": [],
"tags": [
"vinagre_enable_shortcuts"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 KiB

View File

@ -0,0 +1,15 @@
{
"area": [
{
"xpos": 371,
"ypos": 171,
"width": 26,
"height": 25,
"type": "match"
}
],
"properties": [],
"tags": [
"vinagre_fullscreen"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 KiB

View File

@ -0,0 +1,15 @@
{
"area": [
{
"xpos": 195,
"ypos": 170,
"width": 32,
"height": 26,
"type": "match"
}
],
"properties": [],
"tags": [
"vinagre_new_connection"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 529 KiB

View File

@ -0,0 +1,15 @@
{
"area": [
{
"xpos": 441,
"ypos": 289,
"width": 30,
"height": 12,
"type": "match"
}
],
"properties": [],
"tags": [
"vinagre_protocol"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 KiB

View File

@ -0,0 +1,15 @@
{
"area": [
{
"xpos": 405,
"ypos": 383,
"width": 32,
"height": 16,
"type": "match"
}
],
"properties": [],
"tags": [
"vinagre_protocol_vnc"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 KiB

View File

@ -4,17 +4,17 @@ use testapi;
use utils; use utils;
sub run { sub run {
menu_launch_type('boxes'); menu_launch_type('vinagre');
assert_screen ['apps_boxes_tutorial', 'boxes_new_connection']; assert_and_click('vinagre_new_connection');
if (match_has_tag 'apps_boxes_tutorial') { assert_and_click('vinagre_protocol');
# Let us get rid of the Tutorial window. assert_and_click('vinagre_protocol_vnc');
send_key 'esc'; send_key('tab');
} type_very_safely("172.16.2.114:5901\n");
assert_and_click('boxes_new_connection'); assert_and_click('vinagre_fullscreen');
assert_and_click('boxes_remote'); assert_and_click('vinagre_allow_inhibit');
type_very_safely("vnc://172.16.2.114:5901\n"); # allow for a stupid animation to happen
assert_and_click('boxes_allow_inhibit'); wait_still_screen 5;
assert_and_click('boxes_fullscreen'); assert_and_click('vinagre_enable_shortcuts');
} }
sub test_flags { sub test_flags {

View File

@ -11,6 +11,9 @@ sub run {
setup_tap_static('172.16.2.115', 'vnc002.test.openqa.fedoraproject.org'); setup_tap_static('172.16.2.115', 'vnc002.test.openqa.fedoraproject.org');
# test test: check if we can see the server # test test: check if we can see the server
assert_script_run "ping -c 2 172.16.2.114"; 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; desktop_vt;
} }