aa20bab713
Summary:
D637 / ec6b3ff4 switched from using needle matches to using
validate_script_output when we want to run a console command
and check the result. validate_script_output is kinda over-
powered when all you want to do is check the command succeeded
(returned 0), though. testapi provides assert_script_run for
doing exactly that - it runs a script and fails if the script
fails (returns anything but 0). This gives us cleaner code and
is slightly more robust; validate_script_output uses the mini
web server on the worker, which I've occasionally seen crap
out, so it seems good to avoid using it when possible. assert_
script_run doesn't need it.
Test Plan: Check all (affected) tests still work properly.
Reviewers: jskladan, garretraziel
Reviewed By: jskladan, garretraziel
Subscribers: tflink
Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D714
47 lines
1.3 KiB
Perl
47 lines
1.3 KiB
Perl
use base "installedtest";
|
|
use strict;
|
|
use testapi;
|
|
|
|
sub run {
|
|
my $self = shift;
|
|
|
|
# wait for either GDM or text login
|
|
if (get_var('UPGRADE') eq "desktop") {
|
|
$self->boot_to_login_screen("graphical_login", 30); # GDM takes time to load
|
|
} else {
|
|
$self->boot_to_login_screen();
|
|
}
|
|
# switch to TTY3 for both, graphical and console tests
|
|
$self->root_console(tty=>3);
|
|
# disable screen blanking (update can take a long time)
|
|
script_run "setterm -blank 0";
|
|
|
|
# upgrader should be installed on up-to-date system
|
|
|
|
assert_script_run 'dnf -y update', 1800;
|
|
|
|
script_run "reboot";
|
|
|
|
if (get_var('UPGRADE') eq "desktop") {
|
|
$self->boot_to_login_screen("graphical_login", 30); # GDM takes time to load
|
|
} else {
|
|
$self->boot_to_login_screen();
|
|
}
|
|
$self->root_console(tty=>3);
|
|
|
|
my $update_command = 'dnf -y --enablerepo=updates-testing install dnf-plugin-system-upgrade';
|
|
assert_script_run $update_command, 1800;
|
|
}
|
|
|
|
|
|
sub test_flags {
|
|
# without anything - rollback to 'lastgood' snapshot if failed
|
|
# 'fatal' - whole test suite is in danger if this fails
|
|
# 'milestone' - after this test succeeds, update 'lastgood'
|
|
# 'important' - if this fails, set the overall state to 'fail'
|
|
return { fatal => 1 };
|
|
}
|
|
|
|
1;
|
|
|
|
# vim: set sw=4 et:
|