From 9c8a4949fa4d42832549aa58d2a9e0316b2bdd01 Mon Sep 17 00:00:00 2001
From: Guy Menanteau <menantea@linux.vnet.ibm.com>
Date: Tue, 21 Feb 2017 10:57:55 -0500
Subject: [PATCH] Modify "install_multi" test for PowerPC

PowerPC arches have the empty disk automatically
mounted on the second position in anaconda (vdb).
Thus, trig installation on second disk.
Change disk checking to point on correct disk.

Warning: this is a workaround specific correction
addressing a specific case.
This will have to be improved/changed with a more
generic code as suggested by Adam Williamson in
https://pagure.io/fedora-qa/os-autoinst-distri-fedora/pull-request/1#comment-31858
proposal for a next commit :)

Signed-off-by: Guy Menanteau <menantea@linux.vnet.ibm.com>
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
 lib/anaconda.pm                        | 15 +++++++++++----
 tests/disk_guided_multi_postinstall.pm |  8 +++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/anaconda.pm b/lib/anaconda.pm
index bcf4876c..cf91e23a 100644
--- a/lib/anaconda.pm
+++ b/lib/anaconda.pm
@@ -33,10 +33,17 @@ sub select_disks {
     assert_and_click "anaconda_main_hub_install_destination";
 
     if (get_var('NUMDISKS') > 1) {
-        # Multi-disk case. Select however many disks the test needs. If
-        # $disks is 0, this will do nothing, and 0 disks will be selected.
-        for my $n (1 .. $args{disks}) {
-            assert_and_click "anaconda_install_destination_select_disk_$n";
+        if (get_var('OFW') && ($args{disks} == 1)) {
+            # we want to select only one disk
+            # for PowerPC this must be the second one that is empty.
+            assert_and_click "anaconda_install_destination_select_disk_2";
+        }
+        else {
+            # Multi-disk case. Select however many disks the test needs. If
+            # $disks is 0, this will do nothing, and 0 disks will be selected.
+            for my $n (1 .. $args{disks}) {
+                assert_and_click "anaconda_install_destination_select_disk_$n";
+            }
         }
     }
     else {
diff --git a/tests/disk_guided_multi_postinstall.pm b/tests/disk_guided_multi_postinstall.pm
index 60fb71ab..9dfc9123 100644
--- a/tests/disk_guided_multi_postinstall.pm
+++ b/tests/disk_guided_multi_postinstall.pm
@@ -5,7 +5,13 @@ use testapi;
 sub run {
     assert_screen "root_console";
     # check that second disk is intact
-    assert_script_run 'mount /dev/vdb1 /mnt';
+    if (get_var('OFW')) {
+        # on PowerPC, installation disk is second disk (vdb)
+        # so need to check vda
+        assert_script_run 'mount /dev/vda1 /mnt';
+    } else {
+        assert_script_run 'mount /dev/vdb1 /mnt';
+    }
     validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Hello, world!/ };
 }