Revert "(CONT-982) - Spec test fix"

This reverts commit 8e1e8eb.

Author: rtib

lib/facter/lvm_support.rb

@@ -13,31 +13,34 @@
 
 # lvm_vgs: [0-9]+
 #   Number of VGs
+vg_list = []
 Facter.add('lvm_vgs') do
   confine lvm_support: true
 
-  setcode do
+  if Facter.value(:lvm_support)
     vgs = Facter::Core::Execution.execute('vgs -o name --noheadings 2>/dev/null', timeout: 30)
+  end
 
-    if vgs.nil?
-      0
-    else
-      vg_list = vgs.split
+  if vgs.nil?
+    setcode { 0 }
+  else
+    vg_list = vgs.split
+    setcode { vg_list.length }
+  end
+end
 
-      # lvm_vg_[0-9]+
-      #   VG name by index
-      vg_list.each_with_index do |vg, i|
-        Facter.add("lvm_vg_#{i}") { setcode { vg } }
-        Facter.add("lvm_vg_#{vg}_pvs") do
-          setcode do
-            pvs = Facter::Core::Execution.execute("vgs -o pv_name #{vg} 2>/dev/null", timeout: 30)
-            res = nil
-            res = pvs.split("\n").grep(%r{^\s+/}).collect(&:strip).sort.join(',') unless pvs.nil?
-            res
-          end
-        end
+# lvm_vg_[0-9]+
+#   VG name by index
+vg_list.each_with_index do |vg, i|
+  Facter.add("lvm_vg_#{i}") { setcode { vg } }
+  Facter.add("lvm_vg_#{vg}_pvs") do
+    setcode do
+      pvs = Facter::Core::Execution.execute("vgs -o pv_name #{vg} 2>/dev/null", timeout: 30)
+      res = nil
+      unless pvs.nil?
+        res = pvs.split("\n").select { |l| l =~ %r{^\s+/} }.map(&:strip).sort.join(',')
       end
-      vg_list.length
+      res
     end
   end
 end
@@ -47,21 +50,20 @@
 pv_list = []
 Facter.add('lvm_pvs') do
   confine lvm_support: true
-
-  setcode do
+  if Facter.value(:lvm_support)
     pvs = Facter::Core::Execution.execute('pvs -o name --noheadings 2>/dev/null', timeout: 30)
+  end
 
-    if pvs.nil?
-      0
-    else
-      pv_list = pvs.split
-
-      # lvm_pv_[0-9]+
-      #   PV name by index
-      pv_list.each_with_index do |pv, i|
-        Facter.add("lvm_pv_#{i}") { setcode { pv } }
-      end
-      pv_list.length
-    end
+  if pvs.nil?
+    setcode { 0 }
+  else
+    pv_list = pvs.split
+    setcode { pv_list.length }
   end
 end
+
+# lvm_pv_[0-9]+
+#   PV name by index
+pv_list.each_with_index do |pv, i|
+  Facter.add("lvm_pv_#{i}") { setcode { pv } }
+end

spec/unit/facter/lvm_support_spec.rb

@@ -54,7 +54,7 @@
   context 'when there is lvm support' do
     context 'when there are no vgs' do
       it 'is set to 0' do
-        Facter::Core::Execution.stubs(:execute) # All other calls
+        allow(Facter::Core::Execution).to receive(:execute) # All other calls
         Facter::Core::Execution.expects(:execute).at_least(1).with('vgs -o name --noheadings 2>/dev/null', timeout: 30).returns(nil)
         Facter.fact(:lvm_support).expects(:value).at_least(1).returns(true)
         Facter.value(:lvm_vgs).should == 0