code cleanup

yast · Aug 14, 2015 · 1f38254 · ancorgs · Aug 14, 2015 · 1f38254
1 parent 4d21c43
commit 1f38254
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/lib/installation/cio_ignore.rb b/src/lib/installation/cio_ignore.rb
@@ -16,9 +16,7 @@ def reset
       if Yast::Mode.autoinst
         @enabled = Yast::AutoinstConfig.cio_ignore
       else
-        if File.exist?("/proc/sysinfo") &&
-            (File.readlines("/proc/sysinfo").grep(/Control Program: KVM\/Linux/).any? ||
-              File.readlines("/proc/sysinfo").grep(/Control Program: z\/VM/).any?)
+        if is_kvm? || is_zvm?
           # cio_ignore does not make sense for KVM or z/VM (fate#317861)
           @enabled = false
         else
@@ -27,6 +25,19 @@ def reset
         end
       end
     end
+
+    private
+
+    def is_kvm?
+      File.exist?("/proc/sysinfo") &&
+        File.readlines("/proc/sysinfo").grep(/Control Program: KVM\/Linux/).any?
+    end
+
+    def is_zvm?
+      File.exist?("/proc/sysinfo") &&
+        File.readlines("/proc/sysinfo").grep(/Control Program: z\/VM/).any?
+    end
+
   end
 
   class CIOIgnoreProposal

diff --git a/test/cio_ignore_test.rb b/test/cio_ignore_test.rb
@@ -20,6 +20,14 @@
       ::Installation::CIOIgnore.instance.reset
       expect(::Installation::CIOIgnore.instance.enabled).to eq(true)
     end
+
+    it "take unexpected value from AutoinstConfig.cio_ignore" do
+      allow(Yast::Mode).to receive(:autoinst).and_return(true)
+      allow(Yast::AutoinstConfig).to receive(:cio_ignore).and_return("autoinst_value")
+      ::Installation::CIOIgnore.instance.reset
+      expect(::Installation::CIOIgnore.instance.enabled).to eq("autoinst_value")
+    end
+
   end
 end