Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2014-08-14 14:57:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2014-08-01 14:34:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2014-08-14 14:57:49.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Aug 13 15:41:41 CEST 2014 - aschn...@suse.de + +- do not incorrectly display message about inconsistent NTFS + filesystem (bnc#889733) + +------------------------------------------------------------------- +Tue Aug 12 11:50:36 CEST 2014 - aschn...@suse.de + +- do not propose boot partition with LVM unless the LVM is + encrypted (bnc#890857) +- version 3.1.41 + +------------------------------------------------------------------- Old: ---- yast2-storage-3.1.40.tar.bz2 New: ---- yast2-storage-3.1.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.SpxNFh/_old 2014-08-14 14:57:50.000000000 +0200 +++ /var/tmp/diff_new_pack.SpxNFh/_new 2014-08-14 14:57:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.40 +Version: 3.1.41 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.1.40.tar.bz2 -> yast2-storage-3.1.41.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/package/yast2-storage.changes new/yast2-storage-3.1.41/package/yast2-storage.changes --- old/yast2-storage-3.1.40/package/yast2-storage.changes 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/package/yast2-storage.changes 2014-08-13 18:04:13.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Aug 13 15:41:41 CEST 2014 - aschn...@suse.de + +- do not incorrectly display message about inconsistent NTFS + filesystem (bnc#889733) + +------------------------------------------------------------------- +Tue Aug 12 11:50:36 CEST 2014 - aschn...@suse.de + +- do not propose boot partition with LVM unless the LVM is + encrypted (bnc#890857) +- version 3.1.41 + +------------------------------------------------------------------- Thu Jul 31 11:18:58 CEST 2014 - aschn...@suse.de - disable snapshots if the root filesystem is small (bnc#888549) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/package/yast2-storage.spec new/yast2-storage-3.1.41/package/yast2-storage.spec --- old/yast2-storage-3.1.40/package/yast2-storage.spec 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/package/yast2-storage.spec 2014-08-13 18:04:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.40 +Version: 3.1.41 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/src/include/partitioning/custom_part_check_generated.rb new/yast2-storage-3.1.41/src/include/partitioning/custom_part_check_generated.rb --- old/yast2-storage-3.1.40/src/include/partitioning/custom_part_check_generated.rb 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/src/include/partitioning/custom_part_check_generated.rb 2014-08-13 18:04:13.000000000 +0200 @@ -426,30 +426,6 @@ ok = false if !Popup.YesNo(message) end - # iSeries has no problems with this configuration - # an initrd will be created and you can boot from a kernel slot - if installation && !Arch.board_iseries && - (root_lvm && !boot_found || show_all_popups) && - AutoinstData.BootLVMWarning - # popup text - message = Builtins.sformat( - _( - "Warning: With your current setup, your %1 installation\n" + - "will encounter problems when booting, because you have no \"boot\"\n" + - "partition and your \"root\" partition is an LVM logical volume.\n" + - "This does not work.\n" + - "\n" + - "If you do not know exactly what you are doing, use a normal\n" + - "partition for your files below /boot.\n" + - "\n" + - "Really use this setup?\n" - ), - Product.name - ) - - ok = false if !Popup.YesNo(message) - end - if (Partitions.EfiBoot || Arch.ia64) && installation && (!boot_found || boot_fs != :vfat) || show_all_popups # popup text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/src/modules/Storage.rb new/yast2-storage-3.1.41/src/modules/Storage.rb --- old/yast2-storage-3.1.40/src/modules/Storage.rb 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/src/modules/Storage.rb 2014-08-13 18:04:13.000000000 +0200 @@ -1048,6 +1048,8 @@ ) ret = { + "ok" => r, + "resize_ok" => resize_ok, "free" => (resize_free>0) ? resize_free : 0, "df_free" => df_free, "used" => used, @@ -1061,7 +1063,7 @@ "ntfs" => used_fs == :ntfs, "new_size" => new_size } - Ops.set(ret, "ok", r) + Builtins.y2milestone("GetFreeSpace %1 ret %2", device, ret) ret end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/src/modules/StorageProposal.rb new/yast2-storage-3.1.41/src/modules/StorageProposal.rb --- old/yast2-storage-3.1.40/src/modules/StorageProposal.rb 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/src/modules/StorageProposal.rb 2014-08-13 18:04:13.000000000 +0200 @@ -632,16 +632,13 @@ def need_boot(disk) - Builtins.y2milestone( - "need_boot NeedBoot:%1 type:%2", - Partitions.NeedBoot, - disk.fetch("type",:CT_UNKNOWN) - ) + log.info("need_boot NeedBoot:#{Partitions.NeedBoot()} " + + "type:#{disk.fetch("type", :CT_UNKNOWN)}") ret = Partitions.NeedBoot || disk.fetch("type",:CT_UNKNOWN) == :CT_DMRAID || (disk.fetch("label","")=="gpt" && !Partitions.EfiBoot) - Builtins.y2milestone("need_boot ret:%1", ret) - ret + log.info("need_boot ret:#{ret}") + return ret end @@ -2896,7 +2893,7 @@ if Partitions.IsDosWinNtPartition(fsid) win = Ops.get_map(p, "winfo", {}) Builtins.y2milestone("try_resize_windows win=%1", win) - if win != nil && Ops.get_boolean(win, "ok", false) && + if win != nil && Ops.get_boolean(win, "resize_ok", false) && Ops.greater_than(Ops.get_integer(p, "size_k", 0), 1024 * 1024) && !Ops.get_boolean(win, "efi", false) Ops.set(p, "winfo", win) @@ -4206,7 +4203,7 @@ !Ops.get_boolean(p, "delete", false) if ret if assert_cons_fs - ret = Ops.get_boolean(p, ["winfo", "ok"], false) && + ret = Ops.get_boolean(p, ["winfo", "resize_ok"], false) && !Ops.get_boolean(p, ["winfo", "efi"], false) else ret = Ops.greater_than(Builtins.size(Ops.get_map(p, "winfo", {})), 0) @@ -4546,7 +4543,7 @@ Ops.get_integer(p, "fsid", 0) )) && Storage.CanDelete(p, Ops.get(target, s, {}), false) - if usable_for_win_resize(p, false) + if usable_for_win_resize(p, false) && !NeedNewDisklabel(Ops.get(target, s, {})) Ops.set( p, "dtxt", @@ -5669,7 +5666,7 @@ Ops.get_integer(p, "fsid", 0) )) && Storage.CanDelete(p, Ops.get(target, s, {}), false) - if usable_for_win_resize(p, false) + if usable_for_win_resize(p, false) && !NeedNewDisklabel(Ops.get(target, s, {})) Ops.set( p, "dtxt", @@ -5824,7 +5821,7 @@ if have_boot boot = {} - else + elsif need_boot(disk) || GetProposalEncrypt() boot = { "mount" => Partitions.BootMount, "size" => Partitions.ProposedBootsize, @@ -6041,7 +6038,7 @@ if have_boot boot = {} - else + elsif need_boot(disk) || GetProposalEncrypt() boot = { "mount" => Partitions.BootMount, "size" => Partitions.ProposedBootsize, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/data/Makefile.am new/yast2-storage-3.1.41/testsuite/data/Makefile.am --- old/yast2-storage-3.1.40/testsuite/data/Makefile.am 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/data/Makefile.am 2014-08-13 18:04:13.000000000 +0200 @@ -3,6 +3,6 @@ # SUBDIRS = empty empty-efi half-empty reuse-home windows windows-only \ - windows-only-efi empty-s390x empty-ppc64le empty-small empty-big \ - empty-big-ppc64le + windows-only-no-resize windows-only-efi empty-s390x empty-ppc64le \ + empty-small empty-big empty-big-ppc64le diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/data/windows-only-no-resize/Makefile.am new/yast2-storage-3.1.41/testsuite/data/windows-only-no-resize/Makefile.am --- old/yast2-storage-3.1.40/testsuite/data/windows-only-no-resize/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/data/windows-only-no-resize/Makefile.am 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/windows-only-no-resize +# + +EXTRA_DIST = disk_sda.info free.info + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/data/windows-only-no-resize/disk_sda.info new/yast2-storage-3.1.41/testsuite/data/windows-only-no-resize/disk_sda.info --- old/yast2-storage-3.1.40/testsuite/data/windows-only-no-resize/disk_sda.info 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/data/windows-only-no-resize/disk_sda.info 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,35 @@ +<?xml version="1.0"?> +<disk> + <name>sda</name> + <device>/dev/sda</device> + <size_k>78150744</size_k> + <major>8</major> + <minor>16</minor> + <range>256</range> + <geometry> + <cylinders>9729</cylinders> + <heads>255</heads> + <sectors>63</sectors> + </geometry> + <label>msdos</label> + <max_primary>4</max_primary> + <ext_possible>true</ext_possible> + <max_logical>63</max_logical> + <partition> + <name>sda1</name> + <device>/dev/sda1</device> + <size_k>78148161</size_k> + <major>8</major> + <minor>17</minor> + <numeric>true</numeric> + <number>1</number> + <fs_type>ntfs-3g</fs_type> + <fs_uuid>33458CDC339D406E</fs_uuid> + <region> + <start>0</start> + <length>9729</length> + </region> + <partition_type>primary</partition_type> + <partition_id>7</partition_id> + </partition> +</disk> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/data/windows-only-no-resize/free.info new/yast2-storage-3.1.41/testsuite/data/windows-only-no-resize/free.info --- old/yast2-storage-3.1.40/testsuite/data/windows-only-no-resize/free.info 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/data/windows-only-no-resize/free.info 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<free> + <free> + <device>/dev/sda1</device> + <resize_cached>true</resize_cached> + <df_free_k>64991212</df_free_k> + <resize_free_k>64991212</resize_free_k> + <used_k>13156948</used_k> + <resize_ok>false</resize_ok> + <content_cached>true</content_cached> + <windows>true</windows> + <efi>false</efi> + <home>false</home> + </free> +</free> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-big-ppc64le1.out new/yast2-storage-3.1.41/testsuite/tests/empty-big-ppc64le1.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-big-ppc64le1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-big-ppc64le1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: ppc64 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create GPT PReP volume /dev/sda1 (7.84 MiB) Dump Create swap volume /dev/sda2 (517.72 MiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-big-ppc64le2.out new/yast2-storage-3.1.41/testsuite/tests/empty-big-ppc64le2.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-big-ppc64le2.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-big-ppc64le2.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,10 @@ +Dump Hardware Excerpt: +Dump Arch: ppc64 +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump Separate Home +Dump Dump Proposal: Dump Create GPT PReP volume /dev/sda1 (7.84 MiB) Dump Create volume /dev/sda2 (2.50 TiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-big1.out new/yast2-storage-3.1.41/testsuite/tests/empty-big1.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-big1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-big1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create BIOS grub volume /dev/sda1 (7.84 MiB) Dump Create swap volume /dev/sda2 (517.72 MiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-big2.out new/yast2-storage-3.1.41/testsuite/tests/empty-big2.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-big2.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-big2.out 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,35 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump +Dump Proposal: +Dump Create BIOS grub volume /dev/sda1 (400.06 MiB) +Dump Create volume /dev/sda2 (2.50 TiB) +Dump Create volume group system (2.50 TiB) from /dev/sda2 [destructive] +Dump Create root volume /dev/system/root (10.00 GiB) with btrfs +Dump Create swap logical volume /dev/system/swap (768.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root +Dump Create subvolume home on device /dev/system/root +Dump Create subvolume opt on device /dev/system/root +Dump Create subvolume srv on device /dev/system/root +Dump Create subvolume tmp on device /dev/system/root +Dump Create subvolume usr/local on device /dev/system/root +Dump Create subvolume var/crash on device /dev/system/root +Dump Create subvolume var/lib/mailman on device /dev/system/root +Dump Create subvolume var/lib/named on device /dev/system/root +Dump Create subvolume var/lib/pgsql on device /dev/system/root +Dump Create subvolume var/log on device /dev/system/root +Dump Create subvolume var/opt on device /dev/system/root +Dump Create subvolume var/spool on device /dev/system/root +Dump Create subvolume var/tmp on device /dev/system/root +Dump +Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt +Dump device:/dev/sda1 fsid:0x107 +Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/system/root +Dump device:/dev/system/swap +Dump +Dump Proposal Feedback: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-big2.rb new/yast2-storage-3.1.41/testsuite/tests/empty-big2.rb --- old/yast2-storage-3.1.40/testsuite/tests/empty-big2.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-big2.rb 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,34 @@ +# encoding: utf-8 + +# testedfiles: helper.rb + +module Yast + + class TestClient < Client + + def main + + def setup1() + setup_system("empty-big") + end + + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + end + + def setup3() + end + + Yast.include self, "helper.rb" + + end + + end + +end + +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-big3.out new/yast2-storage-3.1.41/testsuite/tests/empty-big3.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-big3.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-big3.out 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,36 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump Encrypt +Dump +Dump Proposal: +Dump Create BIOS grub volume /dev/sda1 (400.06 MiB) +Dump Create encrypted volume /dev/sda2 (2.50 TiB) +Dump Create volume group system (2.50 TiB) from /dev/sda2 [destructive] +Dump Create root volume /dev/system/root (10.00 GiB) with btrfs +Dump Create swap logical volume /dev/system/swap (768.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root +Dump Create subvolume home on device /dev/system/root +Dump Create subvolume opt on device /dev/system/root +Dump Create subvolume srv on device /dev/system/root +Dump Create subvolume tmp on device /dev/system/root +Dump Create subvolume usr/local on device /dev/system/root +Dump Create subvolume var/crash on device /dev/system/root +Dump Create subvolume var/lib/mailman on device /dev/system/root +Dump Create subvolume var/lib/named on device /dev/system/root +Dump Create subvolume var/lib/pgsql on device /dev/system/root +Dump Create subvolume var/log on device /dev/system/root +Dump Create subvolume var/opt on device /dev/system/root +Dump Create subvolume var/spool on device /dev/system/root +Dump Create subvolume var/tmp on device /dev/system/root +Dump +Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt +Dump device:/dev/sda1 fsid:0x107 +Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/system/root +Dump device:/dev/system/swap +Dump +Dump Proposal Feedback: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-big3.rb new/yast2-storage-3.1.41/testsuite/tests/empty-big3.rb --- old/yast2-storage-3.1.40/testsuite/tests/empty-big3.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-big3.rb 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,36 @@ +# encoding: utf-8 + +# testedfiles: helper.rb + +module Yast + + class TestClient < Client + + def main + + def setup1() + setup_system("empty-big") + end + + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + end + + def setup3() + StorageProposal.SetProposalEncrypt(true) + StorageProposal.SetProposalPassword("12345678") + end + + Yast.include self, "helper.rb" + + end + + end + +end + +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-efi1.out new/yast2-storage-3.1.41/testsuite/tests/empty-efi1.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-efi1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-efi1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: x86_64 efi +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create boot volume /dev/sda1 (156.88 MiB) with vfat Dump Create swap volume /dev/sda2 (517.72 MiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-efi2.out new/yast2-storage-3.1.41/testsuite/tests/empty-efi2.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-efi2.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-efi2.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: x86_64 efi +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Create boot volume /dev/sda1 (156.88 MiB) with vfat Dump Create swap volume /dev/sda2 (2.01 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-efi3.out new/yast2-storage-3.1.41/testsuite/tests/empty-efi3.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-efi3.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-efi3.out 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,38 @@ +Dump Hardware Excerpt: +Dump Arch: x86_64 efi +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump Separate Home +Dump +Dump Proposal: +Dump Create boot volume /dev/sda1 (156.88 MiB) with vfat +Dump Create volume /dev/sda2 (297.94 GiB) +Dump Create volume group system (297.93 GiB) from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/home (25.00 GiB) for /home with xfs +Dump Create root volume /dev/system/root (10.00 GiB) with btrfs +Dump Create swap logical volume /dev/system/swap (768.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root +Dump Create subvolume boot/grub2/x86_64-efi on device /dev/system/root +Dump Create subvolume opt on device /dev/system/root +Dump Create subvolume srv on device /dev/system/root +Dump Create subvolume tmp on device /dev/system/root +Dump Create subvolume usr/local on device /dev/system/root +Dump Create subvolume var/crash on device /dev/system/root +Dump Create subvolume var/lib/mailman on device /dev/system/root +Dump Create subvolume var/lib/named on device /dev/system/root +Dump Create subvolume var/lib/pgsql on device /dev/system/root +Dump Create subvolume var/log on device /dev/system/root +Dump Create subvolume var/opt on device /dev/system/root +Dump Create subvolume var/spool on device /dev/system/root +Dump Create subvolume var/tmp on device /dev/system/root +Dump +Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt +Dump device:/dev/sda1 fsid:0x103 +Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/system/root +Dump device:/dev/system/swap +Dump device:/dev/system/home +Dump +Dump Proposal Feedback: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-efi3.rb new/yast2-storage-3.1.41/testsuite/tests/empty-efi3.rb --- old/yast2-storage-3.1.40/testsuite/tests/empty-efi3.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-efi3.rb 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,34 @@ +# encoding: utf-8 + +# testedfiles: helper.rb + +module Yast + + class TestClient < Client + + def main + + def setup1() + setup_system("empty-efi") + end + + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + end + + def setup3() + end + + Yast.include self, "helper.rb" + + end + + end + +end + +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-efi4.out new/yast2-storage-3.1.41/testsuite/tests/empty-efi4.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-efi4.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-efi4.out 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,39 @@ +Dump Hardware Excerpt: +Dump Arch: x86_64 efi +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump Encrypt +Dump Separate Home +Dump +Dump Proposal: +Dump Create boot volume /dev/sda1 (156.88 MiB) with vfat +Dump Create volume /dev/sda2 (400.06 MiB) for /boot with btrfs +Dump Create encrypted volume /dev/sda3 (297.54 GiB) +Dump Create volume group system (297.54 GiB) from /dev/sda3 [destructive] +Dump Create logical volume /dev/system/home (25.00 GiB) for /home with xfs +Dump Create root volume /dev/system/root (10.00 GiB) with btrfs +Dump Create swap logical volume /dev/system/swap (768.00 MiB) +Dump Create subvolume opt on device /dev/system/root +Dump Create subvolume srv on device /dev/system/root +Dump Create subvolume tmp on device /dev/system/root +Dump Create subvolume usr/local on device /dev/system/root +Dump Create subvolume var/crash on device /dev/system/root +Dump Create subvolume var/lib/mailman on device /dev/system/root +Dump Create subvolume var/lib/named on device /dev/system/root +Dump Create subvolume var/lib/pgsql on device /dev/system/root +Dump Create subvolume var/log on device /dev/system/root +Dump Create subvolume var/opt on device /dev/system/root +Dump Create subvolume var/spool on device /dev/system/root +Dump Create subvolume var/tmp on device /dev/system/root +Dump +Dump Target Map Excerpt: +Dump device:/dev/sda label:gpt +Dump device:/dev/sda1 fsid:0x103 +Dump device:/dev/sda2 fsid:0x83 +Dump device:/dev/sda3 fsid:0x8e +Dump device:/dev/system/root +Dump device:/dev/system/swap +Dump device:/dev/system/home +Dump +Dump Proposal Feedback: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-efi4.rb new/yast2-storage-3.1.41/testsuite/tests/empty-efi4.rb --- old/yast2-storage-3.1.40/testsuite/tests/empty-efi4.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-efi4.rb 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,36 @@ +# encoding: utf-8 + +# testedfiles: helper.rb + +module Yast + + class TestClient < Client + + def main + + def setup1() + setup_system("empty-efi") + end + + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + end + + def setup3() + StorageProposal.SetProposalEncrypt(true) + StorageProposal.SetProposalPassword("12345678") + end + + Yast.include self, "helper.rb" + + end + + end + +end + +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-ppc64le1.out new/yast2-storage-3.1.41/testsuite/tests/empty-ppc64le1.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-ppc64le1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-ppc64le1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: ppc64 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create PReP volume /dev/sda1 (7.84 MiB) Dump Create swap volume /dev/sda2 (517.72 MiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-ppc64le2.out new/yast2-storage-3.1.41/testsuite/tests/empty-ppc64le2.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-ppc64le2.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-ppc64le2.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: ppc64 +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Create PReP volume /dev/sda1 (7.84 MiB) Dump Create swap volume /dev/sda2 (2.01 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-ppc64le3.out new/yast2-storage-3.1.41/testsuite/tests/empty-ppc64le3.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-ppc64le3.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-ppc64le3.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,10 @@ +Dump Hardware Excerpt: +Dump Arch: ppc64 +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump Separate Home +Dump Dump Proposal: Dump Create PReP volume /dev/sda1 (7.84 MiB) Dump Create volume /dev/sda2 (298.08 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-s390x1.out new/yast2-storage-3.1.41/testsuite/tests/empty-s390x1.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-s390x1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-s390x1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: s390_64 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create volume /dev/sda1 (203.95 MiB) for /boot/zipl with ext2 Dump Create swap volume /dev/sda2 (517.72 MiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty-small1.out new/yast2-storage-3.1.41/testsuite/tests/empty-small1.out --- old/yast2-storage-3.1.40/testsuite/tests/empty-small1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty-small1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Create swap volume /dev/sda1 (517.72 MiB) Dump Create root volume /dev/sda2 (3.49 GiB) with btrfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty1.out new/yast2-storage-3.1.41/testsuite/tests/empty1.out --- old/yast2-storage-3.1.40/testsuite/tests/empty1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create swap volume /dev/sda1 (517.72 MiB) Dump Create root volume /dev/sda2 (297.58 GiB) with btrfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty2.out new/yast2-storage-3.1.41/testsuite/tests/empty2.out --- old/yast2-storage-3.1.40/testsuite/tests/empty2.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty2.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Create swap volume /dev/sda1 (2.01 GiB) Dump Create root volume /dev/sda2 (40.00 GiB) with btrfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty3.out new/yast2-storage-3.1.41/testsuite/tests/empty3.out --- old/yast2-storage-3.1.40/testsuite/tests/empty3.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty3.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,9 +1,15 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump Dump Proposal: -Dump Create boot volume /dev/sda1 (400.06 MiB) with ext4 -Dump Create volume /dev/sda2 (29.96 GiB) -Dump Create volume group system (29.95 GiB) from /dev/sda2 [destructive] +Dump Create volume /dev/sda1 (30.00 GiB) +Dump Create volume group system (29.99 GiB) from /dev/sda1 [destructive] Dump Create root volume /dev/system/root (10.00 GiB) with btrfs Dump Create swap logical volume /dev/system/swap (512.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root Dump Create subvolume home on device /dev/system/root Dump Create subvolume opt on device /dev/system/root Dump Create subvolume srv on device /dev/system/root @@ -20,8 +26,7 @@ Dump Dump Target Map Excerpt: Dump device:/dev/sda label:msdos -Dump device:/dev/sda1 fsid:0x83 -Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/sda1 fsid:0x8e Dump device:/dev/system/root Dump device:/dev/system/swap Dump diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty4.out new/yast2-storage-3.1.41/testsuite/tests/empty4.out --- old/yast2-storage-3.1.40/testsuite/tests/empty4.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty4.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,10 +1,17 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump Separate Home +Dump Dump Proposal: -Dump Create boot volume /dev/sda1 (400.06 MiB) with ext4 -Dump Create volume /dev/sda2 (29.96 GiB) -Dump Create volume group system (29.95 GiB) from /dev/sda2 [destructive] -Dump Create logical volume /dev/system/home (19.45 GiB) for /home with xfs +Dump Create volume /dev/sda1 (30.00 GiB) +Dump Create volume group system (29.99 GiB) from /dev/sda1 [destructive] +Dump Create logical volume /dev/system/home (19.49 GiB) for /home with xfs Dump Create root volume /dev/system/root (10.00 GiB) with btrfs Dump Create swap logical volume /dev/system/swap (512.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root Dump Create subvolume opt on device /dev/system/root Dump Create subvolume srv on device /dev/system/root Dump Create subvolume tmp on device /dev/system/root @@ -20,8 +27,7 @@ Dump Dump Target Map Excerpt: Dump device:/dev/sda label:msdos -Dump device:/dev/sda1 fsid:0x83 -Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/sda1 fsid:0x8e Dump device:/dev/system/root Dump device:/dev/system/swap Dump device:/dev/system/home diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty5.out new/yast2-storage-3.1.41/testsuite/tests/empty5.out --- old/yast2-storage-3.1.40/testsuite/tests/empty5.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty5.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,9 +1,15 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump Dump Proposal: -Dump Create boot volume /dev/sda1 (400.06 MiB) with ext4 -Dump Create volume /dev/sda2 (297.70 GiB) -Dump Create volume group system (297.69 GiB) from /dev/sda2 [destructive] +Dump Create volume /dev/sda1 (298.09 GiB) +Dump Create volume group system (298.08 GiB) from /dev/sda1 [destructive] Dump Create root volume /dev/system/root (10.00 GiB) with btrfs Dump Create swap logical volume /dev/system/swap (768.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root Dump Create subvolume home on device /dev/system/root Dump Create subvolume opt on device /dev/system/root Dump Create subvolume srv on device /dev/system/root @@ -20,8 +26,7 @@ Dump Dump Target Map Excerpt: Dump device:/dev/sda label:msdos -Dump device:/dev/sda1 fsid:0x83 -Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/sda1 fsid:0x8e Dump device:/dev/system/root Dump device:/dev/system/swap Dump diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty6.out new/yast2-storage-3.1.41/testsuite/tests/empty6.out --- old/yast2-storage-3.1.40/testsuite/tests/empty6.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty6.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,10 +1,17 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump Separate Home +Dump Dump Proposal: -Dump Create boot volume /dev/sda1 (400.06 MiB) with ext4 -Dump Create volume /dev/sda2 (297.70 GiB) -Dump Create volume group system (297.69 GiB) from /dev/sda2 [destructive] +Dump Create volume /dev/sda1 (298.09 GiB) +Dump Create volume group system (298.08 GiB) from /dev/sda1 [destructive] Dump Create logical volume /dev/system/home (25.00 GiB) for /home with xfs Dump Create root volume /dev/system/root (10.00 GiB) with btrfs Dump Create swap logical volume /dev/system/swap (768.00 MiB) +Dump Create subvolume boot/grub2/i386-pc on device /dev/system/root Dump Create subvolume opt on device /dev/system/root Dump Create subvolume srv on device /dev/system/root Dump Create subvolume tmp on device /dev/system/root @@ -20,8 +27,7 @@ Dump Dump Target Map Excerpt: Dump device:/dev/sda label:msdos -Dump device:/dev/sda1 fsid:0x83 -Dump device:/dev/sda2 fsid:0x8e +Dump device:/dev/sda1 fsid:0x8e Dump device:/dev/system/root Dump device:/dev/system/swap Dump device:/dev/system/home diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty7.out new/yast2-storage-3.1.41/testsuite/tests/empty7.out --- old/yast2-storage-3.1.40/testsuite/tests/empty7.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty7.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Create swap volume /dev/sda1 (2.01 GiB) Dump Create root volume /dev/sda2 (40.00 GiB) with btrfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty8.out new/yast2-storage-3.1.41/testsuite/tests/empty8.out --- old/yast2-storage-3.1.40/testsuite/tests/empty8.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty8.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Create swap volume /dev/sda1 (2.01 GiB) Dump Create root volume /dev/sda2 (40.00 GiB) with btrfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/empty9.out new/yast2-storage-3.1.41/testsuite/tests/empty9.out --- old/yast2-storage-3.1.40/testsuite/tests/empty9.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/empty9.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,11 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump LVM +Dump Encrypt +Dump Separate Home +Dump Dump Proposal: Dump Create boot volume /dev/sda1 (400.06 MiB) with ext4 Dump Create encrypted volume /dev/sda2 (29.96 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty-big-ppc64le1.out new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty-big-ppc64le1.out --- old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty-big-ppc64le1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty-big-ppc64le1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: ppc64 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create GPT PReP volume /dev/sda1 (7.84 MiB) Dump Create swap volume /dev/sda2 (1.00 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty-efi1.out new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty-efi1.out --- old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty-efi1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty-efi1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: x86_64 efi +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create boot volume /dev/sda1 (156.88 MiB) with vfat Dump Create swap volume /dev/sda2 (1.00 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty-efi2.out new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty-efi2.out --- old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty-efi2.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty-efi2.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: x86_64 efi +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create boot volume /dev/sda1 (517.72 MiB) with vfat Dump Create swap volume /dev/sda2 (1.00 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty-ppc64le1.out new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty-ppc64le1.out --- old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty-ppc64le1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty-ppc64le1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: ppc64 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create PReP volume /dev/sda1 (7.84 MiB) Dump Create swap volume /dev/sda2 (1.00 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty-ppc64le2.out new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty-ppc64le2.out --- old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty-ppc64le2.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty-ppc64le2.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: ppc64 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create PReP volume /dev/sda1 (7.84 MiB) Dump Create swap volume /dev/sda2 (1.00 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty1.out new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty1.out --- old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create swap volume /dev/sda1 (1.00 GiB) Dump Create volume /dev/sda2 (289.08 GiB) for /data with btrfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty2.out new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty2.out --- old/yast2-storage-3.1.40/testsuite/tests/flex-info-empty2.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/flex-info-empty2.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create extended partition /dev/sda1 (298.09 GiB) Dump Create boot volume /dev/sda5 (517.72 MiB) with ext4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/flex-xml-empty-efi1.out new/yast2-storage-3.1.41/testsuite/tests/flex-xml-empty-efi1.out --- old/yast2-storage-3.1.40/testsuite/tests/flex-xml-empty-efi1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/flex-xml-empty-efi1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: x86_64 efi +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create boot volume /dev/sda1 (156.88 MiB) with vfat Dump Create swap volume /dev/sda2 (1.00 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/flex-xml-empty-ppc64le1.out new/yast2-storage-3.1.41/testsuite/tests/flex-xml-empty-ppc64le1.out --- old/yast2-storage-3.1.40/testsuite/tests/flex-xml-empty-ppc64le1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/flex-xml-empty-ppc64le1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: ppc64 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create PReP volume /dev/sda1 (7.84 MiB) Dump Create swap volume /dev/sda2 (1.00 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/flex-xml-empty1.out new/yast2-storage-3.1.41/testsuite/tests/flex-xml-empty1.out --- old/yast2-storage-3.1.40/testsuite/tests/flex-xml-empty1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/flex-xml-empty1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,8 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Dump Proposal: Dump Create swap volume /dev/sda1 (1.00 GiB) Dump Create volume /dev/sda2 (289.08 GiB) for /data with btrfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/half-empty1.out new/yast2-storage-3.1.41/testsuite/tests/half-empty1.out --- old/yast2-storage-3.1.40/testsuite/tests/half-empty1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/half-empty1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Create extended partition /dev/sda3 (147.09 GiB) Dump Create swap volume /dev/sda5 (2.01 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/helper.rb new/yast2-storage-3.1.41/testsuite/tests/helper.rb --- old/yast2-storage-3.1.40/testsuite/tests/helper.rb 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/helper.rb 2014-08-13 18:04:13.000000000 +0200 @@ -7,20 +7,123 @@ def initialize_helper(include_target) + def setup_system(name) SCR.Execute(path(".target.bash"), "mkdir -p tmp") SCR.Execute(path(".target.bash"), "rm -rf tmp/*") SCR.Execute(path(".target.bash"), "cp data/#{name}/*.info tmp/") end + @part_info_size = 0 @part_info_string = nil + def setup_part_info(content) @part_info_size = content.size() @part_info_string = content end + + def dump_hardware() + + Testsuite.Dump("Hardware Excerpt:") + + Testsuite.Dump("Arch: " + Arch.architecture() + (Partitions.EfiBoot() ? " efi" : "")) + + end + + + def dump_settings() + + Testsuite.Dump("Proposal Settings Excerpt:") + + if StorageProposal.GetProposalLvm() + Testsuite.Dump("LVM") + end + if StorageProposal.GetProposalEncrypt() + Testsuite.Dump("Encrypt") + end + if StorageProposal.GetProposalHome() + Testsuite.Dump("Separate Home") + end + + end + + + def dump_proposal(infos) + + Testsuite.Dump("Proposal:") + + infos.each do |info| + text = info.fetch(:text, "") + if info.fetch(:destructive, false) + text += " [destructive]" + end + Testsuite.Dump(text) + end + + end + + + def dump_target_map(prop) + + Testsuite.Dump("Target Map Excerpt:") + + prop["target"].each do |device, container| + + if Storage.IsDiskType(container.fetch("type", :CT_UNKNOWN)) + + line = "device:#{container["device"]}" + + if container.fetch("label", "") != "" + line << " label:#{container["label"]}" + end + + Testsuite.Dump(line) + + end + + container["partitions"].each do |volume| + + line = "device:#{volume["device"]}" + + if volume.fetch("delete", 0) != 0 + line << " delete" + end + + if volume.fetch("fsid", 0) != 0 + line << " fsid:0x#{volume["fsid"].to_s(16)}" + end + + if !volume.fetch("userdata", {}).empty? + line << " userdata:#{volume["userdata"]}" + end + + Testsuite.Dump(line) + + end + + end + + end + + + def dump_feedback(prop) + + Testsuite.Dump("Proposal Feedback:") + + if StorageProposal.CouldNotDoSnapshots(prop["target"]) + Testsuite.Dump("Cound not do snapshots.") + end + + if StorageProposal.CouldNotDoSeparateHome(prop["target"]) + Testsuite.Dump("Cound not do separate home.") + end + + end + + setup1() Yast.import "Testsuite" @@ -85,68 +188,21 @@ setup3() + dump_hardware() + Testsuite.Dump("") + dump_settings() + Testsuite.Dump("") + prop = StorageProposal.get_inst_prop(target_map) if prop.fetch("ok", false) Storage.SetTargetMap(prop.fetch("target", {})) - - infos = Storage.GetCommitInfos - - Testsuite.Dump("Proposal:") - infos.each do |info| - text = info.fetch(:text, "") - if info.fetch(:destructive, false) - text += " [destructive]" - end - Testsuite.Dump(text) - end - + infos = Storage.GetCommitInfos() + dump_proposal(infos) Testsuite.Dump("") - - Testsuite.Dump("Target Map Excerpt:") - prop["target"].each do |device, container| - - if Storage.IsDiskType(container.fetch("type", :CT_UNKNOWN)) - - line = "device:#{container["device"]}" - - if container.fetch("label", "") != "" - line << " label:#{container["label"]}" - end - - Testsuite.Dump(line) - - end - - container["partitions"].each do |volume| - - line = "device:#{volume["device"]}" - - if volume.fetch("fsid", 0) != 0 - line << " fsid:0x#{volume["fsid"].to_s(16)}" - end - - if !volume.fetch("userdata", {}).empty? - line << " userdata:#{volume["userdata"]}" - end - - Testsuite.Dump(line) - - end - - end - + dump_target_map(prop) Testsuite.Dump("") - - Testsuite.Dump("Proposal Feedback:") - if StorageProposal.CouldNotDoSnapshots(prop["target"]) - Testsuite.Dump("Cound not do snapshots.") - end - - if StorageProposal.CouldNotDoSeparateHome(prop["target"]) - Testsuite.Dump("Cound not do separate home.") - end - + dump_feedback(prop) else Testsuite.Dump("No proposal.") end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/reuse-home1.out new/yast2-storage-3.1.41/testsuite/tests/reuse-home1.out --- old/yast2-storage-3.1.40/testsuite/tests/reuse-home1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/reuse-home1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Format partition /dev/sda2 (15.01 GiB) with btrfs [destructive] Dump Create subvolume boot/grub2/i386-pc on device /dev/sda2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/windows-only-efi1.out new/yast2-storage-3.1.41/testsuite/tests/windows-only-efi1.out --- old/yast2-storage-3.1.40/testsuite/tests/windows-only-efi1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/windows-only-efi1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: x86_64 efi +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Shrink Windows partition /dev/sda2 to 7.78 GiB [destructive] Dump Create swap volume /dev/sda3 (517.72 MiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/windows-only-no-resize1.out new/yast2-storage-3.1.41/testsuite/tests/windows-only-no-resize1.out --- old/yast2-storage-3.1.40/testsuite/tests/windows-only-no-resize1.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/tests/windows-only-no-resize1.out 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,33 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump +Dump Proposal: +Dump Delete Windows partition /dev/sda1 (74.53 GiB). Resize impossible due to inconsistent file system. Try checking file system under Windows. [destructive] +Dump Create swap volume /dev/sda1 (2.01 GiB) +Dump Create root volume /dev/sda2 (20.00 GiB) with btrfs +Dump Create volume /dev/sda3 (52.52 GiB) for /home with xfs +Dump Create subvolume boot/grub2/i386-pc on device /dev/sda2 +Dump Create subvolume opt on device /dev/sda2 +Dump Create subvolume srv on device /dev/sda2 +Dump Create subvolume tmp on device /dev/sda2 +Dump Create subvolume usr/local on device /dev/sda2 +Dump Create subvolume var/crash on device /dev/sda2 +Dump Create subvolume var/lib/mailman on device /dev/sda2 +Dump Create subvolume var/lib/named on device /dev/sda2 +Dump Create subvolume var/lib/pgsql on device /dev/sda2 +Dump Create subvolume var/log on device /dev/sda2 +Dump Create subvolume var/opt on device /dev/sda2 +Dump Create subvolume var/spool on device /dev/sda2 +Dump Create subvolume var/tmp on device /dev/sda2 +Dump +Dump Target Map Excerpt: +Dump device:/dev/sda label:msdos +Dump device:/dev/sda1 delete fsid:0x7 +Dump device:/dev/sda1 fsid:0x82 +Dump device:/dev/sda2 fsid:0x83 +Dump device:/dev/sda3 fsid:0x83 +Dump +Dump Proposal Feedback: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/windows-only-no-resize1.rb new/yast2-storage-3.1.41/testsuite/tests/windows-only-no-resize1.rb --- old/yast2-storage-3.1.40/testsuite/tests/windows-only-no-resize1.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.41/testsuite/tests/windows-only-no-resize1.rb 2014-08-13 18:04:13.000000000 +0200 @@ -0,0 +1,34 @@ +# encoding: utf-8 + +# testedfiles: helper.rb + +module Yast + + class TestClient < Client + + def main + + def setup1() + setup_system("windows-only-no-resize") + end + + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) + ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") + end + + def setup3() + end + + Yast.include self, "helper.rb" + + end + + end + +end + +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/windows-only1.out new/yast2-storage-3.1.41/testsuite/tests/windows-only1.out --- old/yast2-storage-3.1.40/testsuite/tests/windows-only1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/windows-only1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Shrink Windows partition /dev/sda1 to 33.21 GiB [destructive] Dump Create extended partition /dev/sda2 (41.32 GiB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.40/testsuite/tests/windows1.out new/yast2-storage-3.1.41/testsuite/tests/windows1.out --- old/yast2-storage-3.1.40/testsuite/tests/windows1.out 2014-07-31 14:09:43.000000000 +0200 +++ new/yast2-storage-3.1.41/testsuite/tests/windows1.out 2014-08-13 18:04:13.000000000 +0200 @@ -1,3 +1,9 @@ +Dump Hardware Excerpt: +Dump Arch: i386 +Dump +Dump Proposal Settings Excerpt: +Dump Separate Home +Dump Dump Proposal: Dump Create extended partition /dev/sda2 (34.52 GiB) Dump Create swap volume /dev/sda5 (517.72 MiB) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org