From f59d2ebb9a3ce8dd31f55660f6c69c8ff0023eed Mon Sep 17 00:00:00 2001
From: Rodion Iafarov <riafarov@suse.com>
Date: Mon, 20 Aug 2018 16:17:50 +0200
Subject: [PATCH] Introduce workarounds to upgrade leap 15.0 to TW

Leap 15.0 installation is not detected as compatible when upgrading to
TW. Therefore we need to introduce soft-failure with workaround to make
it work.

See [poo#39713](https://progress.opensuse.org/issues/39713).
---
 tests/installation/upgrade_select.pm          | 12 +++++++++++-
 tests/installation/upgrade_select_opensuse.pm |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/installation/upgrade_select.pm b/tests/installation/upgrade_select.pm
index ca7f3f24a6c2..4cdb74a295e9 100644
--- a/tests/installation/upgrade_select.pm
+++ b/tests/installation/upgrade_select.pm
@@ -30,8 +30,17 @@ sub run {
         send_key $cmd{ok};
     }
 
+    my $update_list_needles = ['select-for-update'];
+    # Detect if empty list is shown due to bsc#1105335
+    push @$update_list_needles, 'empty-update-list' if check_var('ORIGINAL_VERSION', '15.0');
     # hardware detection and waiting for updates from suse.com can take a while
-    assert_screen_with_soft_timeout('select-for-update', timeout => 500, soft_timeout => 100, bugref => 'bsc#1028774');
+    assert_screen_with_soft_timeout($update_list_needles, timeout => 500, soft_timeout => 100, bugref => 'bsc#1028774');
+    if (match_has_tag 'empty-update-list') {
+        record_soft_failure('bsc#1105335');
+        # Check show all partitions checkbox
+        send_key('alt-s');
+        assert_screen 'select-for-update';
+    }
     send_key $cmd{next};
     assert_screen [qw(remove-repository license-agreement license-agreement-accepted)], 240;
     if (match_has_tag("license-agreement") || match_has_tag("license-agreement-accepted")) {
@@ -79,4 +88,5 @@ sub run {
     }
 }
 
+sub post_fail_hook {}
 1;
diff --git a/tests/installation/upgrade_select_opensuse.pm b/tests/installation/upgrade_select_opensuse.pm
index 8260f2438ff1..6e2f5b83f168 100644
--- a/tests/installation/upgrade_select_opensuse.pm
+++ b/tests/installation/upgrade_select_opensuse.pm
@@ -68,4 +68,5 @@ sub run {
     assert_screen "update-installation-overview", 60;
 }
 
+sub post_fail_hook {}
 1;