X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Funit%2Ffacter%2Fapt_updates_spec.rb;h=cc1aa94e21b740d27b43b2fd72a19a83cfa338f2;hb=2b536b6a200e8f4f7f7ae37ec091abd06ca4cb70;hp=8c726fc343539f101daab2cc64fe80f3588a9b61;hpb=ebf9d9f6a629dc69973cad6092080f36ec5af1d6;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/spec/unit/facter/apt_updates_spec.rb b/spec/unit/facter/apt_updates_spec.rb
index 8c726fc..cc1aa94 100644
--- a/spec/unit/facter/apt_updates_spec.rb
+++ b/spec/unit/facter/apt_updates_spec.rb
@@ -2,28 +2,30 @@ require 'spec_helper'
 
 describe 'apt_updates fact' do
   subject { Facter.fact(:apt_updates).value }
+
   after(:each) { Facter.clear }
 
   describe 'when apt has no updates' do
-    before { 
+    before(:each) do
       Facter.fact(:apt_has_updates).stubs(:value).returns false
-    }
+    end
     it { is_expected.to be nil }
   end
 
   describe 'when apt has updates' do
-    before { 
+    before(:each) do
       Facter.fact(:osfamily).stubs(:value).returns 'Debian'
       File.stubs(:executable?) # Stub all other calls
       Facter::Util::Resolution.stubs(:exec) # Catch all other calls
       File.expects(:executable?).with('/usr/bin/apt-get').returns true
-      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s upgrade 2>&1').returns ""+
-        "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n"+
-        "Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n"+
-        "Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"+
-        "Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"
-    }
+      apt_output = <<-EOT
+Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])
+Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])
+Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])
+Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])
+EOT
+      Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns apt_output
+    end
     it { is_expected.to eq(2) }
   end
-
 end