testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Tweaks to AVC test loading / run

Browse Source 
Committing without review as this causes failures...try to make
sure we only run the AVC test when it makes sense, and fix
running it on the French install test.
This commit is contained in:
Adam Williamson 2016-12-08 12:03:26 -08:00
parent 7687a3aa34
commit cc7fe4b971
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/main_common.pm
View File

@ -6,7 +6,7 @@ use base 'Exporter';
use Exporter; use Exporter;
use testapi; use testapi;
our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout/; our @EXPORT = qw/run_with_error_check type_safely type_very_safely desktop_vt boot_to_login_screen console_login console_switch_layout console_loadkeys_us/;
sub run_with_error_check { sub run_with_error_check {
my ($func, $error_screen) = @_; my ($func, $error_screen) = @_;
@ -133,3 +133,10 @@ sub console_login {
# make sure we reached the console # make sure we reached the console
assert_screen($good, 30); assert_screen($good, 30);
} }
# load US layout (from a root console)
sub console_loadkeys_us {
if (get_var('LANGUAGE') eq 'french') {
script_run "loqdkeys us", 0;
}
}

10
main.pm
View File

@ -204,8 +204,14 @@ sub load_postinstall_tests() {
autotest::loadtest "tests/uefi_postinstall.pm"; autotest::loadtest "tests/uefi_postinstall.pm";
} }
# console avc / crash check (desktops have specific tests for this) # console avc / crash check
if (!get_var("DESKTOP")) { # it makes no sense to run this after logging in on most post-
# install tests (hence ! BOOTFROM) but we *do* want to run it on
# upgrade tests after upgrading (hence UPGRADE)
# desktops have specific tests for this (hence !DESKTOP). For
# desktop upgrades we should really upload a disk image at the end
# of upgrade and run all the desktop post-install tests on that
if (!get_var("DESKTOP") && (!get_var("BOOTFROM") || get_var("UPGRADE"))) {
autotest::loadtest "tests/_console_avc_crash.pm"; autotest::loadtest "tests/_console_avc_crash.pm";
} }

4
tests/_console_wait_login.pm
View File

@ -24,6 +24,10 @@ sub run {
} }
if (get_var("ROOT_PASSWORD")) { if (get_var("ROOT_PASSWORD")) {
console_login(user=>"root", password=>get_var("ROOT_PASSWORD")); console_login(user=>"root", password=>get_var("ROOT_PASSWORD"));
# if this is a non-English, non-switched layout, load US layout
# at this point as we've already checked the default layout is
# the native one, and we might want to run other commands now
console_loadkeys_us;
} }
} }