Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2015-03-05 15:34:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2015-03-01 14:52:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2015-03-05 18:15:15.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 25 21:48:10 UTC 2015 - jreidinger@suse.com + +- Fixed creation of a multipath device map +- 3.1.124 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.123.tar.bz2 New: ---- yast2-bootloader-3.1.124.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.DOG2mc/_old 2015-03-05 18:15:16.000000000 +0100 +++ /var/tmp/diff_new_pack.DOG2mc/_new 2015-03-05 18:15:16.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.123 +Version: 3.1.124 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.123.tar.bz2 -> yast2-bootloader-3.1.124.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.123/package/yast2-bootloader.changes new/yast2-bootloader-3.1.124/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.123/package/yast2-bootloader.changes 2015-02-25 18:07:10.000000000 +0100 +++ new/yast2-bootloader-3.1.124/package/yast2-bootloader.changes 2015-03-03 08:37:09.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 25 21:48:10 UTC 2015 - jreidinger@suse.com + +- Fixed creation of a multipath device map +- 3.1.124 + +------------------------------------------------------------------- Wed Feb 18 16:22:05 UTC 2015 - jreidinger@suse.com - fix crash on ppc(bnc#917833) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.123/package/yast2-bootloader.spec new/yast2-bootloader-3.1.124/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.123/package/yast2-bootloader.spec 2015-02-25 18:07:10.000000000 +0100 +++ new/yast2-bootloader-3.1.124/package/yast2-bootloader.spec 2015-03-03 08:37:09.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.123 +Version: 3.1.124 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.123/src/modules/BootStorage.rb new/yast2-bootloader-3.1.124/src/modules/BootStorage.rb --- old/yast2-bootloader-3.1.123/src/modules/BootStorage.rb 2015-02-25 18:07:10.000000000 +0100 +++ new/yast2-bootloader-3.1.124/src/modules/BootStorage.rb 2015-03-03 08:37:09.000000000 +0100 @@ -84,7 +84,7 @@ ret = {} tm = Storage.GetTargetMap tm.each do |disk, disk_info| - next unless disk_info["type"] != :CT_DMMULTIPATH + next if disk_info["type"] != :CT_DMMULTIPATH devices = disk_info["devices"] || [] devices.each { |d| ret[d] = disk } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.123/test/boot_storage_test.rb new/yast2-bootloader-3.1.124/test/boot_storage_test.rb --- old/yast2-bootloader-3.1.123/test/boot_storage_test.rb 2015-02-25 18:07:10.000000000 +0100 +++ new/yast2-bootloader-3.1.124/test/boot_storage_test.rb 2015-03-03 08:37:09.000000000 +0100 @@ -92,4 +92,34 @@ expect(result).to include("/dev/vda") end end + + describe ".multipath_mapping" do + before do + mock_disk_partition + # force reinit every time + allow(subject).to receive(:checkCallingDiskInfo).and_return(true) + # mock getting mount points as it need whole libstorage initialization + allow(Yast::Storage).to receive(:GetMountPoints).and_return("/" => "/dev/vda1") + # mock for same reason getting udev mapping + allow(::Bootloader::UdevMapping).to receive(:to_mountby_device) do |arg| + arg + end + end + + it "returns empty map if there is no multipath" do + target_map_stub("storage_lvm.rb") + + # init variables + subject.InitDiskInfo + expect(subject.multipath_mapping).to eq({}) + end + + it "returns map of kernel names for disk devices to multipath devices associated with it" do + target_map_stub("many_disks.rb") + + # init variables + subject.InitDiskInfo + expect(subject.multipath_mapping["/dev/sda"]).to eq "/dev/mapper/3600508b1001c9a84c91492de27962d57" + end + end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org