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

move 'loadkeys us' call into avc_crash test for now

Browse Source 
Ugh, there's no good way to do this ATM. If this doesn't work
I might just skip the test for this case.
This commit is contained in:
Adam Williamson 2016-12-08 12:18:45 -08:00
parent cc7fe4b971
commit 6dc20de0b0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/_console_avc_crash.pm
View File

@ -5,6 +5,13 @@ use testapi;
sub run { sub run {
my $self = shift; my $self = shift;
$self->root_console(tty=>3); $self->root_console(tty=>3);
# if this is a non-English, non-switched layout, load US layout
# at this point
# FIXME: this is all kind of a mess, as on such configs we need
# native layout to log in to a console but US layout to type
# anything at a console. the more advanced upstream 'console'
# handling may help us here if we switch to it
console_loadkeys_us;
# check there are no AVCs. We use ! because this returns 1 # check there are no AVCs. We use ! because this returns 1
validate_script_output '! ausearch -m avc -ts yesterday 2>&1', sub { $_ =~ m/<no matches>/ }; validate_script_output '! ausearch -m avc -ts yesterday 2>&1', sub { $_ =~ m/<no matches>/ };
# check there are no crashes # check there are no crashes

4
tests/_console_wait_login.pm
View File

@ -24,10 +24,6 @@ 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;
} }
} }