Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 'sle15_workarounds' trying to switch tty with keypress unconditionally #3613

Merged
merged 2 commits into from
Sep 22, 2017
Merged

Fix 'sle15_workarounds' trying to switch tty with keypress unconditionally #3613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4579e9
Unregister ENV-15ORLATER-1 needles for SLE < 15
okurz Sep 21, 2017
f1416fc
Fix 'sle15_workarounds' trying to switch tty with keypress unconditio…
okurz Sep 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions products/sle/main.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ sub cleanup_needles {
$tounregister = sle_version_at_least('12-SP3') ? '0' : '1';
unregister_needle_tags("ENV-SP3ORLATER-$tounregister");

$tounregister = sle_version_at_least('15') ? '0' : '1';
unregister_needle_tags("ENV-15ORLATER-$tounregister");

if (!is_server) {
unregister_needle_tags("ENV-FLAVOR-Server-DVD");
}
Expand Down
12 changes: 8 additions & 4 deletions tests/console/sle15_workarounds.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@ use utils qw(zypper_call sle_version_at_least pkcon_quit);
sub run {
my $self = shift;
return unless sle_version_at_least('15');
send_key('ctrl-alt-f2');
assert_screen(["tty2-selected", 'text-login', 'text-logged-in-root', 'generic-desktop']);
if (match_has_tag 'generic-desktop') {
record_soft_failure 'bsc#1054782';
# try to detect bsc#1054782 only on the backend which can handle
# 'ctrl-alt-f2' directly
if (check_var('BACKEND', 'qemu')) {
send_key('ctrl-alt-f2');
assert_screen(["tty2-selected", 'text-login', 'text-logged-in-root', 'generic-desktop']);
if (match_has_tag 'generic-desktop') {
record_soft_failure 'bsc#1054782';
}
}
select_console('root-console');
# Stop packagekit
Expand Down