Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-storage -> sle12 ## BNC# 874551 : "/boot/grub2/i386-pc is empty if boot partition is used" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-storage/yast2-storage.changes 2014-04-11 16:05:12.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-storage/yast2-storage.changes 2014-04-30 10:46:36.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 29 17:51:15 CEST 2014 - aschnell@suse.de + +- do not create boot subvolumes in the proposal if a boot partition + is proposed (bnc#874551) +- version 3.1.20 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-storage - at least 24 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-storage (Old) and /mounts/work_src_done/SLE12/yast2-storage (BS:build ID:37082 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-storage-3.1.19.tar.bz2 New: ---- yast2-storage-3.1.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.0Ytvyj/_old 2014-04-30 12:58:28.000000000 +0200 +++ /var/tmp/diff_new_pack.0Ytvyj/_new 2014-04-30 12:58:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.19 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.1.19.tar.bz2 -> yast2-storage-3.1.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/package/yast2-storage.changes new/yast2-storage-3.1.20/package/yast2-storage.changes --- old/yast2-storage-3.1.19/package/yast2-storage.changes 2014-04-11 15:43:37.000000000 +0200 +++ new/yast2-storage-3.1.20/package/yast2-storage.changes 2014-04-30 10:40:54.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 29 17:51:15 CEST 2014 - aschnell@suse.de + +- do not create boot subvolumes in the proposal if a boot partition + is proposed (bnc#874551) +- version 3.1.20 + +------------------------------------------------------------------- Fri Apr 11 14:34:48 CEST 2014 - aschnell@suse.de - allow to resize GPT Boot partition (bnc#872919) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/package/yast2-storage.spec new/yast2-storage-3.1.20/package/yast2-storage.spec --- old/yast2-storage-3.1.19/package/yast2-storage.spec 2014-04-11 15:43:37.000000000 +0200 +++ new/yast2-storage-3.1.20/package/yast2-storage.spec 2014-04-30 10:40:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.19 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/src/modules/StorageProposal.rb new/yast2-storage-3.1.20/src/modules/StorageProposal.rb --- old/yast2-storage-3.1.19/src/modules/StorageProposal.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/src/modules/StorageProposal.rb 2014-04-30 10:40:54.000000000 +0200 @@ -4031,7 +4031,10 @@ if Ops.get_boolean(ps1, "ok", false) ret = Ops.get_list(ps1, ["disk", "partitions"], []) end - ret = post_process_partitions(ret) + + post_processor = PostProcessor.new() + ret = post_processor.process_partitions(ret) + Builtins.y2milestone("get_proposal ret:%1", ret) deep_copy(ret) end @@ -4385,54 +4388,98 @@ end - def post_process_partitions(partitions) + class PostProcessor + + public + + def process_partitions(partitions) + + @have_boot_partition = false + @have_home_partition = false - have_home_partition = false + analyse(partitions) - partitions.each do |volume| + return modify(partitions) - # check whether we have a home partition - if volume["mount"] == "/home" - have_home_partition = true + end + + def process_target(target) + + @have_boot_partition = false + @have_home_partition = false + + target.each do |device, container| + analyse(container["partitions"]) end + target.each do |device, container| + container["partitions"] = modify(container["partitions"]) + end + + return target + end - partitions.each do |volume| + private - # if we have a home volume remove the home subvolume - if PropDefaultFs() == :btrfs && have_home_partition - if volume["mount"] == "/" - if FileSystems.default_subvol.empty? - home = "home" - else - home = FileSystems.default_subvol + "/" + "home" - end - volume["subvol"].delete_if { |subvol| subvol["name"] == home } + def analyse(partitions) + + partitions.each do |volume| + + # check whether we have a boot partition + if volume["mount"] == "/boot" + @have_boot_partition = true end - end - # enable snapshots for root volume if desired - if PropDefaultFs() == :btrfs && GetProposalSnapshots() - if volume["mount"] == "/" - volume["userdata"] = { "/" => "snapshots" } + # check whether we have a home partition + if volume["mount"] == "/home" + @have_home_partition = true end + end end - return partitions + def modify(partitions) - end + partitions.each do |volume| + # if we have a boot volume remove the boot subvolumes + if StorageProposal.PropDefaultFs() == :btrfs && @have_boot_partition + if volume["mount"] == "/" + if FileSystems.default_subvol.empty? + boot = "boot" + else + boot = FileSystems.default_subvol + "/" + "boot" + end + volume["subvol"].delete_if { |subvol| subvol["name"].start_with?(boot) } + end + end - def post_process_target(target) + # if we have a home volume remove the home subvolume + if StorageProposal.PropDefaultFs() == :btrfs && @have_home_partition + if volume["mount"] == "/" + if FileSystems.default_subvol.empty? + home = "home" + else + home = FileSystems.default_subvol + "/" + "home" + end + volume["subvol"].delete_if { |subvol| subvol["name"] == home } + end + end - target.each do |device, container| - container["partitions"] = post_process_partitions(container["partitions"]) - end + # enable snapshots for root volume if desired + if StorageProposal.PropDefaultFs() == :btrfs && StorageProposal.GetProposalSnapshots() + if volume["mount"] == "/" + volume["userdata"] = { "/" => "snapshots" } + end + end - return target + end + + return partitions + + end end @@ -5005,7 +5052,10 @@ "get_inst_proposal sol:%1", Ops.get_map(ret, ["target", sol_disk], {}) ) - ret["target"] = post_process_target(ret["target"]) + + post_processor = PostProcessor.new() + ret["target"] = post_processor.process_target(ret["target"]) + end Builtins.y2milestone( "get_inst_proposal ret[ok]:%1", @@ -5909,6 +5959,10 @@ Ops.get_map(ret, ["target", sol_disk], {}) ) end + + post_processor = PostProcessor.new() + ret["target"] = post_processor.process_target(ret["target"]) + Builtins.y2milestone( "get_inst_prop_vm ret[ok]:%1", Ops.get_boolean(ret, "ok", false) @@ -6145,7 +6199,7 @@ if ! Arch.s390 vb = Builtins.add(vb, VSpacing(1)) - + vb = Builtins.add( vb, Left( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty-big1.rb new/yast2-storage-3.1.20/testsuite/tests/empty-big1.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty-big1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty-big1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,8 @@ # testedfiles: helper1b.yh module Yast - class Empty1Client < Client + + class TestClient < Client def main Yast.include self, "setup-system.rb" @@ -19,12 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end end + end -Yast::Empty1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty-efi1.rb new/yast2-storage-3.1.20/testsuite/tests/empty-efi1.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty-efi1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty-efi1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class EmptyEfi1Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -18,11 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::EmptyEfi1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty-efi2.rb new/yast2-storage-3.1.20/testsuite/tests/empty-efi2.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty-efi2.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty-efi2.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class EmptyEfi2Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -18,11 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::EmptyEfi2Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty-ppc64le1.rb new/yast2-storage-3.1.20/testsuite/tests/empty-ppc64le1.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty-ppc64le1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty-ppc64le1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,8 @@ # testedfiles: helper1b.yh module Yast - class Empty1Client < Client + + class TestClient < Client def main Yast.include self, "setup-system.rb" @@ -19,12 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + def setup3() + end + Yast.include self, "helper1b.rb" nil end end + end -Yast::Empty1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty-ppc64le2.rb new/yast2-storage-3.1.20/testsuite/tests/empty-ppc64le2.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty-ppc64le2.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty-ppc64le2.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,8 @@ # testedfiles: helper1b.yh module Yast - class Empty1Client < Client + + class TestClient < Client def main Yast.include self, "setup-system.rb" @@ -19,12 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + def setup3() + end + Yast.include self, "helper1b.rb" nil end end + end -Yast::Empty1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty-s390x1.rb new/yast2-storage-3.1.20/testsuite/tests/empty-s390x1.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty-s390x1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty-s390x1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,8 @@ # testedfiles: helper1b.yh module Yast - class Empty1Client < Client + + class TestClient < Client def main Yast.include self, "setup-system.rb" @@ -19,12 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + def setup3() + end + Yast.include self, "helper1b.rb" nil end end + end -Yast::Empty1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty-small1.rb new/yast2-storage-3.1.20/testsuite/tests/empty-small1.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty-small1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty-small1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,8 @@ # testedfiles: helper1b.yh module Yast - class Empty1Client < Client + + class TestClient < Client def main Yast.include self, "setup-system.rb" @@ -18,12 +19,16 @@ ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) ProductFeatures.SetStringFeature("partitioning", "root_base_size", "10 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end end + end -Yast::Empty1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty1.rb new/yast2-storage-3.1.20/testsuite/tests/empty1.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,8 @@ # testedfiles: helper1b.yh module Yast - class Empty1Client < Client + + class TestClient < Client def main Yast.include self, "setup-system.rb" @@ -19,12 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end end + end -Yast::Empty1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty2.rb new/yast2-storage-3.1.20/testsuite/tests/empty2.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty2.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty2.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class Empty2Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -18,11 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::Empty2Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty3.out new/yast2-storage-3.1.20/testsuite/tests/empty3.out --- old/yast2-storage-3.1.19/testsuite/tests/empty3.out 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty3.out 2014-04-30 10:40:54.000000000 +0200 @@ -4,7 +4,6 @@ Dump Create volume group system (29.95 GiB) from /dev/sda2 [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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty3.rb new/yast2-storage-3.1.20/testsuite/tests/empty3.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty3.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty3.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class Empty3Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -19,11 +21,16 @@ ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::Empty3Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty4.out new/yast2-storage-3.1.20/testsuite/tests/empty4.out --- old/yast2-storage-3.1.19/testsuite/tests/empty4.out 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty4.out 2014-04-30 10:40:54.000000000 +0200 @@ -5,8 +5,6 @@ Dump Create logical volume /dev/system/home (19.45 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 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty4.rb new/yast2-storage-3.1.20/testsuite/tests/empty4.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty4.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty4.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class Empty4Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -19,11 +21,16 @@ ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::Empty4Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty5.out new/yast2-storage-3.1.20/testsuite/tests/empty5.out --- old/yast2-storage-3.1.19/testsuite/tests/empty5.out 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty5.out 2014-04-30 10:40:54.000000000 +0200 @@ -4,7 +4,6 @@ Dump Create volume group system (297.69 GiB) 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty5.rb new/yast2-storage-3.1.20/testsuite/tests/empty5.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty5.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty5.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class Empty5Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -18,11 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::Empty5Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty6.out new/yast2-storage-3.1.20/testsuite/tests/empty6.out --- old/yast2-storage-3.1.19/testsuite/tests/empty6.out 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty6.out 2014-04-30 10:40:54.000000000 +0200 @@ -5,8 +5,6 @@ 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 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty6.rb new/yast2-storage-3.1.20/testsuite/tests/empty6.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty6.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty6.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class Empty6Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -18,11 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::Empty6Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty7.rb new/yast2-storage-3.1.20/testsuite/tests/empty7.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty7.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty7.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class Empty1Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -18,11 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::Empty1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty8.rb new/yast2-storage-3.1.20/testsuite/tests/empty8.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty8.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/empty8.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,8 @@ # testedfiles: helper1b.yh module Yast - class Empty1Client < Client + + class TestClient < Client def main Yast.include self, "setup-system.rb" @@ -21,12 +22,16 @@ ProductFeatures.SetStringFeature("partitioning", "root_max_size", "10 GB") ProductFeatures.SetIntegerFeature("partitioning", "btrfs_increase_percentage", 300) + def setup3() + end + Yast.include self, "helper1b.rb" nil end end + end -Yast::Empty1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/empty9.out new/yast2-storage-3.1.20/testsuite/tests/empty9.out --- old/yast2-storage-3.1.19/testsuite/tests/empty9.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.20/testsuite/tests/empty9.out 2014-04-30 10:40:54.000000000 +0200 @@ -0,0 +1,27 @@ +Dump Proposal: +Dump Create boot volume /dev/sda1 (400.06 MiB) with ext4 +Dump Create encrypted 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 root volume /dev/system/root (10.00 GiB) with btrfs +Dump Create swap logical volume /dev/system/swap (512.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/pgqsl 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:msdos +Dump device:/dev/sda1 fsid:0x83 +Dump device:/dev/sda2 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.19/testsuite/tests/empty9.rb new/yast2-storage-3.1.20/testsuite/tests/empty9.rb --- old/yast2-storage-3.1.19/testsuite/tests/empty9.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.20/testsuite/tests/empty9.rb 2014-04-30 10:40:54.000000000 +0200 @@ -0,0 +1,38 @@ +# encoding: utf-8 + +# testedfiles: helper1b.yh +module Yast + + class TestClient < Client + + def main + Yast.include self, "setup-system.rb" + + setup_system("empty") + + Yast.include self, "helper1a.rb" + + Yast.import "ProductFeatures" + + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) + ProductFeatures.SetBooleanFeature("partitioning", "vm_keep_unpartitioned_region", true) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + + def setup3() + StorageProposal.SetProposalEncrypt(true) + StorageProposal.SetProposalPassword("12345678") + end + + Yast.include self, "helper1b.rb" + + nil + end + + end + +end + +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/half-empty1.rb new/yast2-storage-3.1.20/testsuite/tests/half-empty1.rb --- old/yast2-storage-3.1.19/testsuite/tests/half-empty1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/half-empty1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class HalfEmpty1Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -17,11 +19,16 @@ ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::HalfEmpty1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/helper1b.rb new/yast2-storage-3.1.20/testsuite/tests/helper1b.rb --- old/yast2-storage-3.1.19/testsuite/tests/helper1b.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/helper1b.rb 2014-04-30 10:40:54.000000000 +0200 @@ -10,9 +10,12 @@ Storage.InitLibstorage(false) - StorageProposal.GetControlCfg + StorageProposal.GetControlCfg() target_map = Storage.GetTargetMap() + + setup3() + prop = StorageProposal.get_inst_prop(target_map) if prop.fetch("ok", false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/reuse-home1.rb new/yast2-storage-3.1.20/testsuite/tests/reuse-home1.rb --- old/yast2-storage-3.1.19/testsuite/tests/reuse-home1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/reuse-home1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class ReuseHome1Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -18,11 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::ReuseHome1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/windows-only-efi1.rb new/yast2-storage-3.1.20/testsuite/tests/windows-only-efi1.rb --- old/yast2-storage-3.1.19/testsuite/tests/windows-only-efi1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/windows-only-efi1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class WindowsOnlyEfi1Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -18,11 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::WindowsOnlyEfi1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/windows-only1.rb new/yast2-storage-3.1.20/testsuite/tests/windows-only1.rb --- old/yast2-storage-3.1.19/testsuite/tests/windows-only1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/windows-only1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class WindowsOnly1Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -18,11 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::WindowsOnly1Client.new.main +Yast::TestClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.19/testsuite/tests/windows1.rb new/yast2-storage-3.1.20/testsuite/tests/windows1.rb --- old/yast2-storage-3.1.19/testsuite/tests/windows1.rb 2014-04-11 15:43:38.000000000 +0200 +++ new/yast2-storage-3.1.20/testsuite/tests/windows1.rb 2014-04-30 10:40:54.000000000 +0200 @@ -2,7 +2,9 @@ # testedfiles: helper1b.yh module Yast - class Windows1Client < Client + + class TestClient < Client + def main Yast.include self, "setup-system.rb" @@ -18,11 +20,16 @@ ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20 GB") ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") + def setup3() + end + Yast.include self, "helper1b.rb" nil end + end + end -Yast::Windows1Client.new.main +Yast::TestClient.new.main continue with "q"... Checked in at Wed Apr 30 12:59:49 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org