Commit 82c9334d authored by Harald Sitter's avatar Harald Sitter

move from evdev assertion to libinput assertion

https://phabricator.kde.org/T10938

the ISOs I think should have been rebuilt in the meantime. if not I guess
we can just force trigger them. easier to just assert libinput rather
than attempt to handle whether or not a given ISO may be libinput.
parent 8093830e
......@@ -242,8 +242,10 @@ sub boot {
select_console 'log-console';
{
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+evdev.+/ };
# We previously forced evdev by default even on 18.04. Make sure this
# was transitioned away from. https://phabricator.kde.org/T10938
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+libinput.+/ };
$self->_archive_iso_artifacts;
$self->_secureboot;
......@@ -258,14 +260,9 @@ sub boot {
assert_script_run 'wget ' . data_url('setup_journald_ttyS1.rb'), 16;
assert_script_sudo 'ruby setup_journald_ttyS1.rb', 60 * 5;
# Make sure the evdev driver is installed. We prefer evdev at this time
# instead of libinput since our KCMs aren't particularly awesome for
# libinput.
if (get_var('OPENQA_SERIES') ne 'xenial') {
assert_script_run 'dpkg -s xserver-xorg-input-evdev';
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+evdev.+/ };
}
# See above about libinput.
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+libinput.+/ };
# TODO: maybe control via env var?
# assert_script_run 'wget ' . data_url('enable_qdebug.rb'), 16;
......
......@@ -40,12 +40,10 @@ sub run {
assert_script_run 'wget ' . data_url('early_first_start.rb'), 16;
assert_script_sudo 'ruby early_first_start.rb', 60 * 5;
# Make sure the evdev driver is installed. We prefer evdev at this time
# instead of libinput since our KCMs aren't particularly awesome for
# libinput.
assert_script_run 'dpkg -s xserver-xorg-input-evdev';
# We previously forced evdev by default even on 18.04. Make sure this
# was transitioned away from. https://phabricator.kde.org/T10938
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+evdev.+/ };
sub { m/.+libinput.+/ };
# Assert that we have no preinstalled pool lingering around on the installed
# rootfs. preinstalled-pool comes from our livecd-rootfs-neon fork and
......
......@@ -245,9 +245,6 @@ sub run {
$testapi::username = $user;
$testapi::password = $password;
# Make sure the evdev driver is installed. We prefer evdev at this time
# instead of libinput since our KCMs aren't particularly awesome for
# libinput.
select_console 'log-console';
{
# Cache sudo password & make sure the home is unmounted!
......@@ -259,12 +256,10 @@ sub run {
# Delete the encrypted user.
assert_script_sudo "deluser $encrypt_user";
# Make sure the evdev driver is installed. We prefer evdev at this time
# instead of libinput since our KCMs aren't particularly awesome for
# libinput.
assert_script_run 'dpkg -s xserver-xorg-input-evdev';
# We previously forced evdev by default even on 18.04. Make sure this
# was transitioned away from. https://phabricator.kde.org/T10938
validate_script_output 'grep -e "Using input driver" /var/log/Xorg.0.log',
sub { m/.+evdev.+/ };
sub { m/.+libinput.+/ };
# Also assert that the upgrade's preference file is no longer present
# T9535
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment