1
0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-14 02:34:21 +00:00

Use 'terminal' instead of 'gnome-terminal' for ptyxis switch

In several places we run 'gnome-terminal' explicitly, but as of
today's compose, the default terminal app on GNOME in Rawhide is
ptyxis, not gnome-terminal.

Running 'terminal' should launch whichever is correct, so let's
consistently do that.

Also, add an apps_run_terminal needle and navigation navbar
needle for ptyxis.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-08-13 09:38:24 -04:00
parent 9a7bcf9573
commit 4be9ce3e88
10 changed files with 46 additions and 8 deletions

View File

@ -1649,7 +1649,7 @@ sub solidify_wallpaper {
} }
elsif ($desktop eq "gnome") { elsif ($desktop eq "gnome") {
# Start the terminal to set up backgrounds. # Start the terminal to set up backgrounds.
menu_launch_type "gnome-terminal"; menu_launch_type "terminal";
# wait to be sure it's fully open # wait to be sure it's fully open
wait_still_screen(stilltime => 5, similarity_level => 38); wait_still_screen(stilltime => 5, similarity_level => 38);
# When the application opens, run command in it to set the background to black # When the application opens, run command in it to set the background to black

View File

@ -0,0 +1,22 @@
{
"area": [
{
"width": 25,
"xpos": 280,
"type": "match",
"ypos": 168,
"height": 21
},
{
"ypos": 125,
"xpos": 192,
"width": 25,
"type": "match",
"height": 20
}
],
"properties": [],
"tags": [
"apps_run_terminal"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 654 KiB

View File

@ -0,0 +1,15 @@
{
"area": [
{
"width": 122,
"xpos": 588,
"ypos": 370,
"height": 34,
"type": "match"
}
],
"properties": [],
"tags": [
"navigation_navibar_terminal"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

View File

@ -3,7 +3,8 @@ use strict;
use testapi; use testapi;
use utils; use utils;
# This test tests if Terminal starts. # This test tests if Terminal starts (which will be gnome-terminal
# in Fedora < 41, ptyxis in Fedora >= 41)
sub run { sub run {
my $self = shift; my $self = shift;
@ -12,7 +13,7 @@ sub run {
assert_screen "apps_run_terminal"; assert_screen "apps_run_terminal";
# Register application # Register application
register_application("gnome-terminal"); register_application("terminal");
# Close the application # Close the application
quit_with_shortcut(); quit_with_shortcut();

View File

@ -22,7 +22,7 @@ sub run {
desktop_vt; desktop_vt;
# On the console, the fonts might differ than in GUI. # On the console, the fonts might differ than in GUI.
# We will perform the tests in the gnome-terminal. # We will perform the tests in the gnome terminal.
# First, open it! # First, open it!
desktop_switch_layout 'ascii'; desktop_switch_layout 'ascii';
wait_still_screen(2); wait_still_screen(2);

View File

@ -5,7 +5,7 @@ use utils;
our $desktop = get_var("DESKTOP"); our $desktop = get_var("DESKTOP");
our $syspwd = get_var("USER_PASSWORD") || "weakpassword"; our $syspwd = get_var("USER_PASSWORD") || "weakpassword";
our $term = "gnome-terminal"; our $term = "terminal";
if ($desktop eq "kde") { if ($desktop eq "kde") {
$term = "konsole"; $term = "konsole";
} }

View File

@ -41,7 +41,7 @@ sub run {
my $editor = "gnome-text-editor"; my $editor = "gnome-text-editor";
my $viewer = "evince"; my $viewer = "evince";
my $maximize = "super-up"; my $maximize = "super-up";
my $term = "gnome-terminal"; my $term = "terminal";
if ($desktop eq "kde") { if ($desktop eq "kde") {
$editor = "kwrite"; $editor = "kwrite";
$viewer = "okular"; $viewer = "okular";

View File

@ -13,10 +13,10 @@ sub run {
my @core_applications; my @core_applications;
# List of applications, that we want to track for their presence. # List of applications, that we want to track for their presence.
unless ($subvariant eq "Silverblue") { unless ($subvariant eq "Silverblue") {
my @core_applications = ("gnome-software", "firefox", "gnome-terminal", "nautilus", "gnome-text-editor", "gnome-boxes"); my @core_applications = ("gnome-software", "firefox", "terminal", "nautilus", "gnome-text-editor", "gnome-boxes");
} }
else { else {
my @core_applications = ("gnome-software", "firefox", "gnome-terminal", "nautilus", "gnome-text-editor"); my @core_applications = ("gnome-software", "firefox", "terminal", "nautilus", "gnome-text-editor");
} }
# Evaluate the results, make the log files and pass or fail the entire # Evaluate the results, make the log files and pass or fail the entire