adapted re-probing to storage-ng

yast · Jun 14, 2017 · f6b5e9e · f6b5e9e
1 parent 48ef703
commit f6b5e9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/lib/installation/clients/inst_disks_activate.rb b/src/lib/installation/clients/inst_disks_activate.rb
@@ -27,6 +27,7 @@
 # $Id$
 #
 
+require "y2storage"
 require "installation/clients/inst_update_installer"
 
 module Yast
@@ -48,7 +49,6 @@ def main
       Yast.import "Label"
       Yast.import "Linuxrc"
       Yast.import "Popup"
-      Yast.import "Storage"
       Yast.import "Wizard"
 
       # all the arguments
@@ -159,7 +159,7 @@ def main
         )
       end
 
-      Storage.ReReadTargetMap if @disks_changed
+      Y2Storage::StorageManager.instance.probe if @disks_changed
 
       Builtins.y2debug("ret=%1", @ret)
 

diff --git a/test/inst_disks_activate_test.rb b/test/inst_disks_activate_test.rb
@@ -16,7 +16,10 @@
       allow(Yast::Popup).to receive(:ConfirmAbort).with(:painless).and_return(true)
       allow(Yast::Arch).to receive(:s390).and_return(s390)
       allow(Yast::GetInstArgs).to receive(:going_back) { going_back }
-      stub_const("Yast::Storage", double("Yast::Storage", ReReadTargetMap: true))
+
+      Y2Storage::StorageManager.create_test_instance
+      allow(Y2Storage::StorageManager.instance).to receive(:probe)
+
       stub_const("Yast::Packages", double(GetBaseSourceID: 0))
     end