mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2025-08-21 06:45:44 +00:00
Fix version number.
This commit is contained in:
parent
bfb0a0e164
commit
68f3578dfa
14
lib/utils.pm
14
lib/utils.pm
@ -1464,7 +1464,17 @@ sub download_testdata {
|
|||||||
# a standalone script but we should be able to invoke this from anywhere if needed.
|
# a standalone script but we should be able to invoke this from anywhere if needed.
|
||||||
# Currently, this only works for Gnome desktop
|
# Currently, this only works for Gnome desktop
|
||||||
sub desktop_login {
|
sub desktop_login {
|
||||||
my ($login,$password) = @_;
|
my ($login, $password) = @_;
|
||||||
|
# Get the version, so that we can handle G-I-S or Gnome Tour.
|
||||||
|
my $version = get_var("VERSION");
|
||||||
|
# For Upgrade tests we will need to handle older releases, so we
|
||||||
|
# fix the version number accordingly
|
||||||
|
if (get_var("GUI_UPGRADE") == 1) {
|
||||||
|
$release = $version-1;
|
||||||
|
}
|
||||||
|
elsif (get_var("GUI_UPGRADE") == 2) {
|
||||||
|
$release = $version-2;
|
||||||
|
}
|
||||||
# For Gnome desktop
|
# For Gnome desktop
|
||||||
if (get_var("DESKTOP") eq 'gnome') {
|
if (get_var("DESKTOP") eq 'gnome') {
|
||||||
send_key_until_needlematch("graphical_login_input", "ret", 3, 5);
|
send_key_until_needlematch("graphical_login_input", "ret", 3, 5);
|
||||||
@ -1477,7 +1487,7 @@ sub desktop_login {
|
|||||||
send_key "ret";
|
send_key "ret";
|
||||||
# Wait until we log in and handle GIS or Tour
|
# Wait until we log in and handle GIS or Tour
|
||||||
wait_still_screen 5;
|
wait_still_screen 5;
|
||||||
if ($relnum < 34) {
|
if ($release < 34) {
|
||||||
# before GNOME 40 (F34), we get a per-user version of
|
# before GNOME 40 (F34), we get a per-user version of
|
||||||
# gnome-initial-setup here...
|
# gnome-initial-setup here...
|
||||||
gnome_initial_setup() unless (get_var("_setup_done"));
|
gnome_initial_setup() unless (get_var("_setup_done"));
|
||||||
|
Loading…
Reference in New Issue
Block a user