srbala
/
os-autoinst-distri-fedora
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
1
0
Fork 0
Code Issues Releases Activity

Make internal state marker variables upper-case 

We use variables to track test state across modules, sometimes.
As this is all internal to the test logic I didn't bother always
making these variables upper-case, but os-autoinst now treats
lower-case variables as a fatal error, so we have to change.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-09-27 23:18:42 -07:00
parent c4443b0298
commit 7675e99fcc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/utils.pm
View File

@ -700,7 +700,7 @@ sub console_initial_setup {
type_string "c\n";
wait_still_screen 7;
assert_screen "console_initial_setup_done", 30;
assert_screen "console_initial_SETUP_DONE", 30;
type_string "c\n"; # continue
}
@ -715,7 +715,7 @@ sub handle_welcome_screen {
else {
record_soft_failure "Welcome tour missing";
}
set_var("_welcome_done", 1);
set_var("_WELCOME_DONE", 1);
}
sub gnome_initial_setup {
@ -834,7 +834,7 @@ sub gnome_initial_setup {
handle_welcome_screen;
}
# don't do it again on second load
set_var("_setup_done", 1);
set_var("_SETUP_DONE", 1);
}
sub _type_user_password {

8
tests/_graphical_wait_login.pm
View File

@ -40,7 +40,7 @@ sub run {
}
# Handle pre-login initial setup if we're doing INSTALL_NO_USER
if (get_var("INSTALL_NO_USER") && !get_var("_setup_done")) {
if (get_var("INSTALL_NO_USER") && !get_var("_SETUP_DONE")) {
if ($desktop eq 'gnome') {
gnome_initial_setup(prelogin => 1, timeout => $wait_time);
}
@ -49,7 +49,7 @@ sub run {
# wait out animation
wait_still_screen 3;
assert_and_click "initialsetup_finish_configuration";
set_var("_setup_done", 1);
set_var("_SETUP_DONE", 1);
}
$wait_time = 300;
}
@ -95,12 +95,12 @@ sub run {
# as this test gets loaded twice on the ADVISORY_OR_TASK flow, and
# we might be on the INSTALL_NO_USER flow, check whether
# this happened already
handle_welcome_screen unless (get_var("_welcome_done"));
handle_welcome_screen unless (get_var("_WELCOME_DONE"));
}
if ($desktop eq 'gnome' && get_var("INSTALL_NO_USER")) {
# handle welcome screen if we didn't do it above (holy flow
# control, Batman!)
handle_welcome_screen unless (get_var("_welcome_done"));
handle_welcome_screen unless (get_var("_WELCOME_DONE"));
# if this was an image deployment, we also need to create
# root user now, for subsequent tests to work
if (get_var("IMAGE_DEPLOY")) {