From 52ceed6f39c202b6b45ca320bd2bc5d4a7e950f8 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 26 Oct 2015 18:02:22 -0700 Subject: [PATCH] upgrade: disable screen blanking before long-running commands Summary: Updating the stable release prior to doing the update can take a long time if the image hasn't been updated for a while, and the upgrade download process itself can take a long time. If the screen blanks out in either case, either the following needle match may fail (if we're waiting for a needle) or 'still screen' may be detected early (if we're waiting for a still screen), so let's disable screen blanking to avoid it. Test Plan: Run the upgrade tests and see if they work. Reviewers: garretraziel, jskladan Reviewed By: jskladan Subscribers: tflink Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D628 --- tests/upgrade_preinstall.pm | 2 ++ tests/upgrade_run.pm | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tests/upgrade_preinstall.pm b/tests/upgrade_preinstall.pm index c93ace9a..224749e6 100644 --- a/tests/upgrade_preinstall.pm +++ b/tests/upgrade_preinstall.pm @@ -13,6 +13,8 @@ sub run { } # switch to TTY3 for both, graphical and console tests $self->root_console(tty=>3); + # disable screen blanking (update can take a long time) + type_string "setterm -blank 0\n"; # upgrader should be installed on up-to-date system diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm index 3d2e28c0..f391ef4a 100644 --- a/tests/upgrade_run.pm +++ b/tests/upgrade_run.pm @@ -11,6 +11,9 @@ sub run { if ($release eq 'rawhide' or $milestone eq 'branched') { $args .= " --nogpgcheck"; } + # disable screen blanking (download can take a long time) + type_string "setterm -blank 0\n"; + type_string "dnf -y system-upgrade download ${args}"; send_key "ret";