Merge pull request #3613 from okurz/fix/non_qemu_fail_in_sle15_workar…

…ound Fix 'sle15_workarounds' trying to switch tty with keypress unconditionally
os-autoinst · Sep 22, 2017 · bdde2a9 · bdde2a9
2 parents f6c4e32 + f1416fc
commit bdde2a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/products/sle/main.pm b/products/sle/main.pm
@@ -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");
     }

diff --git a/tests/console/sle15_workarounds.pm b/tests/console/sle15_workarounds.pm
@@ -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