Adapt yaml/tests for changes in formatting/mounting options with libyui

os-autoinst · Jan 28, 2021 · 94329fa · 94329fa
1 parent c34a555
commit 94329fa
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 34 deletions.
diff --git a/schedule/yast/separate_usr_partition.yaml b/schedule/yast/separate_usr_partition.yaml
@@ -38,7 +38,8 @@ test_data:
       partitions:
       - name: vda2
         size: 18GiB
-      - role: raw-volume
+      - name: vda2
+        role: raw-volume
         formatting_options:
           should_format: 1
           filesystem: xfs

diff --git a/schedule/yast/yast2_gui/yast2_gui_sle.yaml b/schedule/yast/yast2_gui/yast2_gui_sle.yaml
@@ -75,11 +75,11 @@ conditional_schedule:
         - yast2_gui/yast2_hostnames
 test_data:
   net_device: eth0
-  errors_in_ifcfg_file:            # Each command is followed by ifcfg file name.
-#   - "sed -i 's/dhcp/dgcp/'"      # Typo in value. To be enabled once bsc#1181296 is fixed.
-    - "echo ETHERDEVICE='eth0' >>" # Wrong device for VLAN (should be same as current).
-    - "echo BOOTPROTO='dhcp' >>"   # Duplicate entry, same data.
-    - "echo BOOTPROTO='none' >>"   # Duplicate entry, different data.
+  errors_in_ifcfg_file:             # Each command is followed by ifcfg file name.
+    # - "sed -i 's/dhcp/dgcp/'"     # Typo in value. To be enabled once bsc#1181296 is fixed.
+    - "echo ETHERDEVICE='eth0' >>"  # Wrong device for VLAN (should be same as current).
+    - "echo BOOTPROTO='dhcp' >>"    # Duplicate entry, same data.
+    - "echo BOOTPROTO='none' >>"    # Duplicate entry, different data.
   disks:
     - name: vdb
       partitions:

diff --git a/test_data/yast/lvm_thin_provisioning/lvm_thin_provisioning.yaml b/test_data/yast/lvm_thin_provisioning/lvm_thin_provisioning.yaml
@@ -25,7 +25,7 @@ lvm:
       - /dev/vda3
     logical_volumes:
       - name: lv-thin-pool
-        type: thin_pool
+        type: thin-pool
       - name: lv-home
-        type: thin_volume
+        type: thin-volume
         role: data
diff --git a/test_data/yast/lvm_thin_provisioning/lvm_thin_provisioning_s390x.yaml b/test_data/yast/lvm_thin_provisioning/lvm_thin_provisioning_s390x.yaml
@@ -30,7 +30,7 @@ lvm:
       - /dev/vda3
     logical_volumes:
       - name: lv-thin-pool
-        type: thin_pool
+        type: thin-pool
       - name: lv-home
-        type: thin_volume
+        type: thin-volume
         role: data
diff --git a/test_data/yast/lvm_thin_provisioning/lvm_thin_provisioning_uefi.yaml b/test_data/yast/lvm_thin_provisioning/lvm_thin_provisioning_uefi.yaml
@@ -31,7 +31,7 @@ lvm:
       - /dev/vda3
     logical_volumes:
       - name: lv-thin-pool
-        type: thin_pool
+        type: thin-pool
       - name: lv-home
-        type: thin_volume
+        type: thin-volume
         role: data
diff --git a/test_data/yast/msdos/msdos.yaml b/test_data/yast/msdos/msdos.yaml
@@ -24,8 +24,7 @@ disks:
         mounting_options:
           should_mount: 1
           mount_point: /home
-      - size: max
-        role: swap
+      - role: swap
         partition_type: primary
         validation_flag: 0
         formatting_options:

diff --git a/test_data/yast/msdos/msdos_hmc.yaml b/test_data/yast/msdos/msdos_hmc.yaml
@@ -29,8 +29,7 @@ disks:
         mounting_options:
           should_mount: 1
           mount_point: /home
-      - size: max
-        role: swap
+      - role: swap
         partition_type: primary
         validation_flag: 0
         formatting_options:

diff --git a/test_data/yast/msdos/msdos_hvm.yaml b/test_data/yast/msdos/msdos_hvm.yaml
@@ -24,8 +24,7 @@ disks:
         mounting_options:
           should_mount: 1
           mount_point: /home
-      - size: max
-        role: swap
+      - role: swap
         partition_type: primary
         validation_flag: 0
         formatting_options:

diff --git a/test_data/yast/msdos/msdos_ppc64le.yaml b/test_data/yast/msdos/msdos_ppc64le.yaml
@@ -29,8 +29,7 @@ disks:
         mounting_options:
           should_mount: 1
           mount_point: /home
-      - size: max
-        role: swap
+      - role: swap
         partition_type: primary
         validation_flag: 0
         formatting_options:

diff --git a/test_data/yast/msdos/msdos_pv.yaml b/test_data/yast/msdos/msdos_pv.yaml
@@ -24,8 +24,7 @@ disks:
         mounting_options:
           should_mount: 1
           mount_point: /home
-      - size: max
-        role: swap
+      - role: swap
         partition_type: primary
         validation_flag: 0
         formatting_options:

diff --git a/test_data/yast/msdos/msdos_s390x.yaml b/test_data/yast/msdos/msdos_s390x.yaml
@@ -24,8 +24,7 @@ disks:
         mounting_options:
           should_mount: 1
           mount_point: /home
-      - size: max
-        role: swap
+      - role: swap
         partition_type: primary
         validation_flag: 0
         formatting_options:

diff --git a/tests/installation/partitioning/edit_proposal_encrypt.pm b/tests/installation/partitioning/edit_proposal_encrypt.pm
@@ -26,7 +26,10 @@ sub run {
         foreach my $partition (@{$disk->{partitions}}) {
             if ($partition->{encrypt_device}) {
                 record_info("Encrypt $partition->{name}", "Encrypting $partition->{name} from disk $disk->{name}");
-                $partitioner->edit_partition_encrypt({disk => $disk->{name}, partition => $partition->{name}});
+                $partitioner->edit_partition_gpt({
+                        disk      => $disk->{name},
+                        partition => $partition
+                });
             }
         }
     }

diff --git a/tests/installation/partitioning/modify_existing_partition.pm b/tests/installation/partitioning/modify_existing_partition.pm
@@ -29,7 +29,7 @@ sub run {
     $partitioner->resize_partition({disk => $disk, partition => $root_part});
     for my $part (@partitions) {
         record_info("Edit $part->{name}", "$part");
-        $partitioner->edit_partition_on_gpt_disk({disk => $disk, partition => $part});
+        $partitioner->edit_partition_gpt({disk => $disk, partition => $part});
     }
     $partitioner->accept_changes_and_press_next();
 }

diff --git a/tests/installation/partitioning/msdos_partition_table.pm b/tests/installation/partitioning/msdos_partition_table.pm
@@ -26,9 +26,9 @@ sub run {
                 table_type => $disk->{table_type}, accept_deleting_current_devices_warning => 0});
         foreach my $partition (@{$disk->{partitions}}) {
             $partitioner->add_partition_msdos({
-                    disk           => $disk->{name},
-                    partition      => $partition,
-                    partition_type => $partition->{partition_type}});
+                    disk      => $disk->{name},
+                    partition => $partition
+            });
         }
     }
     $partitioner->accept_changes_and_press_next;

diff --git a/tests/installation/partitioning/resize_existing_lv.pm b/tests/installation/partitioning/resize_existing_lv.pm
@@ -1,13 +1,13 @@
 # SUSE's openQA tests
 #
-# Copyright © 2020 SUSE LLC
+# Copyright © 2020-2021 SUSE LLC
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved. This file is offered as-is,
 # without any warranty.
 
-# Summary: modify and resize existing logical volume on a pre-configured disk.
+# Summary: Modify and resize existing logical volume on a pre-configured disk.
 # Maintainer: QE YaST <qa-sle-yast@suse.com>
 
 use strict;
@@ -25,8 +25,8 @@ sub run {
         foreach my $lv (@{$vg->{logical_volumes}}) {
             $partitioner->resize_logical_volume({
                     volume_group   => $vg->{name},
-                    logical_volume => $lv->{name},
-                    size           => $lv->{size}
+                    logical_volume => $lv,
+
             });
         }
     }

diff --git a/tests/installation/partitioning/separate_usr_partition.pm b/tests/installation/partitioning/separate_usr_partition.pm
@@ -26,7 +26,7 @@ sub run {
     my $partitioner = $testapi::distri->get_expert_partitioner();
     $partitioner->run_expert_partitioner('current');
     $partitioner->resize_partition({disk => $disk, partition => $root_part});
-    $partitioner->add_partition_on_gpt_disk({partition => $usr_part});
+    $partitioner->add_partition_on_gpt_disk({disk => $disk, partition => $usr_part});
     $partitioner->accept_changes_and_press_next();
 }