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# 874288 : "YaST2 partitioning module won't correctly add existing btrfs filesystem" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-storage/yast2-storage.changes 2014-04-30 12:59:48.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-storage/yast2-storage.changes 2014-04-30 17:10:24.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 30 15:28:35 CEST 2014 - aschnell@suse.de + +- fixed importing mount points with btrfs (bnc#874288) +- version 3.1.21 + +------------------------------------------------------------------- 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:37236 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-storage-3.1.20.tar.bz2 New: ---- yast2-storage-3.1.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.yz39ak/_old 2014-04-30 17:40:35.000000000 +0200 +++ /var/tmp/diff_new_pack.yz39ak/_new 2014-04-30 17:40:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.20 +Version: 3.1.21 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.1.20.tar.bz2 -> yast2-storage-3.1.21.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/package/yast2-storage.changes new/yast2-storage-3.1.21/package/yast2-storage.changes --- old/yast2-storage-3.1.20/package/yast2-storage.changes 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/package/yast2-storage.changes 2014-04-30 17:05:47.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 30 15:28:35 CEST 2014 - aschnell@suse.de + +- fixed importing mount points with btrfs (bnc#874288) +- version 3.1.21 + +------------------------------------------------------------------- Tue Apr 29 17:51:15 CEST 2014 - aschnell@suse.de - do not create boot subvolumes in the proposal if a boot partition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/package/yast2-storage.spec new/yast2-storage-3.1.21/package/yast2-storage.spec --- old/yast2-storage-3.1.20/package/yast2-storage.spec 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/package/yast2-storage.spec 2014-04-30 17:05:47.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.20 +Version: 3.1.21 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/src/include/partitioning/ep-import.rb new/yast2-storage-3.1.21/src/include/partitioning/ep-import.rb --- old/yast2-storage-3.1.20/src/include/partitioning/ep-import.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/src/include/partitioning/ep-import.rb 2014-04-30 17:05:47.000000000 +0200 @@ -226,7 +226,17 @@ Builtins.maplist(Ops.get_list(disk, "partitions", [])) do |partition| part_device = Ops.get_string(partition, "device", "") if !Storage.IsInstallationSource(part_device) - Builtins.foreach(fstab) do |fstab_entry| + fstab.each do |fstab_entry| + + type_fstab = fstab_entry["detected_fs"] + opts_fstab = fstab_entry["fstopt"] + + # YaST cannot handle multiple mount points per device so ignore all + # subvolume mounts (bnc #874288) + if type_fstab == :btrfs && opts_fstab.include?("subvol=") + next + end + dev_fstab = Ops.get_string(fstab_entry, "device", "") mount_fstab = Ops.get_string(fstab_entry, "mount", "") if dev_fstab == part_device @@ -236,7 +246,7 @@ Ops.set(partition, "format", true) end if format_sys && Ops.get_string(partition, "mount", "") == "/" && - Ops.get_symbol(partition, "detected_fs", :unknown) == :BTRFS + Ops.get_symbol(partition, "detected_fs", :unknown) == :btrfs partition = Storage.AddSubvolRoot(partition) end if !Builtins.isempty( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty-big1.rb new/yast2-storage-3.1.21/testsuite/tests/empty-big1.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty-big1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty-big1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty-big") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty-big") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) - ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + 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, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty-efi1.rb new/yast2-storage-3.1.21/testsuite/tests/empty-efi1.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty-efi1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty-efi1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty-efi") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty-efi") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) - ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + 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, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty-efi2.rb new/yast2-storage-3.1.21/testsuite/tests/empty-efi2.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty-efi2.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty-efi2.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty-efi") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty-efi") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) - ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + 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, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty-ppc64le1.rb new/yast2-storage-3.1.21/testsuite/tests/empty-ppc64le1.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty-ppc64le1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty-ppc64le1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty-ppc64le") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty-ppc64le") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty-ppc64le2.rb new/yast2-storage-3.1.21/testsuite/tests/empty-ppc64le2.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty-ppc64le2.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty-ppc64le2.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty-ppc64le") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty-ppc64le") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty-s390x1.rb new/yast2-storage-3.1.21/testsuite/tests/empty-s390x1.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty-s390x1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty-s390x1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty-s390x") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty-s390x") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty-small1.rb new/yast2-storage-3.1.21/testsuite/tests/empty-small1.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty-small1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty-small1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,30 +1,29 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty-small") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty-small") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "10 GB") + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "10 GB") + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty1.rb new/yast2-storage-3.1.21/testsuite/tests/empty1.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) - ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + 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, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty2.rb new/yast2-storage-3.1.21/testsuite/tests/empty2.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty2.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty2.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) - ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty3.rb new/yast2-storage-3.1.21/testsuite/tests/empty3.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty3.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty3.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,32 +1,31 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) - 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 setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) + 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") + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty4.rb new/yast2-storage-3.1.21/testsuite/tests/empty4.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty4.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty4.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,32 +1,31 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty") + end - 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 setup2() + 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") + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty5.rb new/yast2-storage-3.1.21/testsuite/tests/empty5.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty5.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty5.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty") + end - 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") + 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, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty6.rb new/yast2-storage-3.1.21/testsuite/tests/empty6.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty6.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty6.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty") + end - 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") + 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, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty7.rb new/yast2-storage-3.1.21/testsuite/tests/empty7.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty7.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty7.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) - ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty8.rb new/yast2-storage-3.1.21/testsuite/tests/empty8.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty8.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty8.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,33 +1,32 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("empty") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("empty") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) - ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "3 GB") - ProductFeatures.SetStringFeature("partitioning", "root_max_size", "10 GB") - ProductFeatures.SetIntegerFeature("partitioning", "btrfs_increase_percentage", 300) + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", true) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "3 GB") + ProductFeatures.SetStringFeature("partitioning", "root_max_size", "10 GB") + ProductFeatures.SetIntegerFeature("partitioning", "btrfs_increase_percentage", 300) + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/empty9.rb new/yast2-storage-3.1.21/testsuite/tests/empty9.rb --- old/yast2-storage-3.1.20/testsuite/tests/empty9.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/empty9.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,34 +1,33 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + 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 setup1() + setup_system("empty") + end + + def setup2() + 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") + end def setup3() StorageProposal.SetProposalEncrypt(true) StorageProposal.SetProposalPassword("12345678") end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/half-empty1.rb new/yast2-storage-3.1.21/testsuite/tests/half-empty1.rb --- old/yast2-storage-3.1.20/testsuite/tests/half-empty1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/half-empty1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,30 +1,29 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("half-empty") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("half-empty") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") + 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_base_size", "20 GB") + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/helper.rb new/yast2-storage-3.1.21/testsuite/tests/helper.rb --- old/yast2-storage-3.1.20/testsuite/tests/helper.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.21/testsuite/tests/helper.rb 2014-04-30 17:05:47.000000000 +0200 @@ -0,0 +1,139 @@ +# encoding: utf-8 + +require 'rexml/document' + +module Yast + module HelperInclude + + 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 + + setup1() + + Yast.import "Testsuite" + + @READ = { + "probe" => { + "architecture" => "i386", + "bios" => [ { "lba_support" => true } ], + "cdrom" => [], + "system" => [ { "system" => "" } ] + }, + "proc" => { + "swaps" => [], + "meminfo" => { "memtotal" => 256 * 1024 } + }, + "sysconfig" => { + "storage" => { "DEFAULT_FS" => "btrfs" }, + "bootloader" => { "LOADER_TYPE" => "grub" }, + "language" => { "RC_LANG" => "en_US.UTF-8", "RC_LC_MESSAGES" => "" } + }, + "target" => { + "size" => 0, + "bash_output" => {}, + "yast2" => {}, + "dir" => [] + } + } + + begin + file = File.new("tmp/arch.info") + doc = REXML::Document.new(file) + arch = doc.elements["arch"].elements["arch"].text + system = "" + if arch == "s390x" + arch = "s390_64" + end + if arch == "ppc64le" + arch = "ppc64" + system = "CHRP" + end + @READ["probe"]["architecture"] = arch + @READ["probe"]["system"][0]["system"] = system + rescue Errno::ENOENT + end + + Testsuite.Init([@READ, {}, @READ], nil) + + Yast.import "Stage" + Yast.import "Storage" + Yast.import "StorageProposal" + + Stage.Set("initial") + + setup2() + + Storage.InitLibstorage(false) + + StorageProposal.GetControlCfg() + + target_map = Storage.GetTargetMap() + + setup3() + + 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 + + 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 + + else + Testsuite.Dump("No proposal.") + end + + Storage.FinishLibstorage + + end + + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/helper1a.rb new/yast2-storage-3.1.21/testsuite/tests/helper1a.rb --- old/yast2-storage-3.1.20/testsuite/tests/helper1a.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/helper1a.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -# encoding: utf-8 - -require 'rexml/document' - -module Yast - module Helper1aInclude - - def initialize_helper1a(include_target) - Yast.import "Testsuite" - - @READ = { - "probe" => { - "architecture" => "i386", - "bios" => [ { "lba_support" => true } ], - "cdrom" => [], - "system" => [ { "system" => "" } ] - }, - "proc" => { - "swaps" => [], - "meminfo" => { "memtotal" => 256 * 1024 } - }, - "sysconfig" => { - "storage" => { "DEFAULT_FS" => "btrfs" }, - "bootloader" => { "LOADER_TYPE" => "grub" }, - "language" => { "RC_LANG" => "en_US.UTF-8", "RC_LC_MESSAGES" => "" } - }, - "target" => { - "size" => 0, - "bash_output" => {}, - "yast2" => {}, - "dir" => [] - } - } - - begin - file = File.new("tmp/arch.info") - doc = REXML::Document.new(file) - arch = doc.elements["arch"].elements["arch"].text - system = "" - if arch == "s390x" - arch = "s390_64" - end - if arch == "ppc64le" - arch = "ppc64" - system = "CHRP" - end - @READ["probe"]["architecture"] = arch - @READ["probe"]["system"][0]["system"] = system - rescue Errno::ENOENT - end - - Testsuite.Init([@READ, {}, @READ], nil) - - Yast.import "Stage" - - Stage.Set("initial") - end - - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/helper1b.rb new/yast2-storage-3.1.21/testsuite/tests/helper1b.rb --- old/yast2-storage-3.1.20/testsuite/tests/helper1b.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/helper1b.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,78 +0,0 @@ -# encoding: utf-8 - -module Yast - module Helper1bInclude - - def initialize_helper1b(include_target) - Yast.import "Storage" - Yast.import "StorageProposal" - Yast.import "Testsuite" - - Storage.InitLibstorage(false) - - StorageProposal.GetControlCfg() - - target_map = Storage.GetTargetMap() - - setup3() - - 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 - - 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 - - else - Testsuite.Dump("No proposal.") - end - - Storage.FinishLibstorage - end - - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/reuse-home1.rb new/yast2-storage-3.1.21/testsuite/tests/reuse-home1.rb --- old/yast2-storage-3.1.20/testsuite/tests/reuse-home1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/reuse-home1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("reuse-home") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("reuse-home") + end - 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") + 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, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/setup-system.rb new/yast2-storage-3.1.21/testsuite/tests/setup-system.rb --- old/yast2-storage-3.1.20/testsuite/tests/setup-system.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/setup-system.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -# encoding: utf-8 - -module Yast - module SetupSystemInclude - def initialize_setup_system(include_target) - - end - - 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"), - Builtins.sformat("cp data/%1/*.info tmp", name) - ) - - nil - end - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/windows-only-efi1.rb new/yast2-storage-3.1.21/testsuite/tests/windows-only-efi1.rb --- old/yast2-storage-3.1.20/testsuite/tests/windows-only-efi1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/windows-only-efi1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("windows-only-efi") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("windows-only-efi") + end - ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) - ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20 GB") - ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") - ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) + def setup2() + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) + ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) + ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") + ProductFeatures.SetBooleanFeature("partitioning", "proposal_snapshots", false) + end def setup3() end - Yast.include self, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/windows-only1.rb new/yast2-storage-3.1.21/testsuite/tests/windows-only1.rb --- old/yast2-storage-3.1.20/testsuite/tests/windows-only1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/windows-only1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("windows-only") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("windows-only") + end - 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") + 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, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.20/testsuite/tests/windows1.rb new/yast2-storage-3.1.21/testsuite/tests/windows1.rb --- old/yast2-storage-3.1.20/testsuite/tests/windows1.rb 2014-04-30 10:40:54.000000000 +0200 +++ new/yast2-storage-3.1.21/testsuite/tests/windows1.rb 2014-04-30 17:05:47.000000000 +0200 @@ -1,31 +1,30 @@ # encoding: utf-8 -# testedfiles: helper1b.yh +# testedfiles: helper.rb + module Yast class TestClient < Client def main - Yast.include self, "setup-system.rb" - - setup_system("windows") - - Yast.include self, "helper1a.rb" - Yast.import "ProductFeatures" + def setup1() + setup_system("windows") + end - 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") + 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, "helper1b.rb" + Yast.include self, "helper.rb" - nil end end continue with "q"... Checked in at Wed Apr 30 17:40:46 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