From: Helen <helen@puppetlabs.com>
Date: Mon, 25 Sep 2017 15:20:34 +0000 (+0100)
Subject: Merge pull request #703 from tphoney/jle64-patch-1
X-Git-Tag: 4.2.0~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c846ce8039f7ef05e56762a98240b76324525d04;hp=00f5f86d91bc83db06fab3499f46268efdd89ebc;p=puppet-modules%2Fpuppetlabs-apt.git

Merge pull request #703 from tphoney/jle64-patch-1

apt_package_security_updates fact and test
---

diff --git a/lib/facter/apt_updates.rb b/lib/facter/apt_updates.rb
index b355f5b..e101dd7 100644
--- a/lib/facter/apt_updates.rb
+++ b/lib/facter/apt_updates.rb
@@ -42,6 +42,17 @@ Facter.add("apt_package_updates") do
   end
 end
 
+Facter.add("apt_package_security_updates") do
+  confine :apt_has_updates => true
+  setcode do
+    if Facter.version < '2.0.0'
+      apt_package_updates[1].join(',')
+    else
+      apt_package_updates[1]
+    end
+  end
+end
+
 Facter.add("apt_updates") do
   confine :apt_has_updates => true
   setcode do
diff --git a/spec/unit/facter/apt_package_security_updates_spec.rb b/spec/unit/facter/apt_package_security_updates_spec.rb
new file mode 100644
index 0000000..868375e
--- /dev/null
+++ b/spec/unit/facter/apt_package_security_updates_spec.rb
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe 'apt_package_security_updates fact' do
+  subject { Facter.fact(:apt_package_security_updates).value }
+  after(:each) { Facter.clear }
+
+  describe 'when apt has no updates' do
+    before { 
+      Facter.fact(:apt_has_updates).stubs(:value).returns false
+    }
+    it { is_expected.to be nil }
+  end
+
+  describe 'when apt has updates' do
+    before { 
+      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 -o Debug::NoLocking=true 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"
+    }
+    it {
+      if Facter.version < '2.0.0'
+        is_expected.to eq('tzdata')
+      else
+        is_expected.to eq(['tzdata'])
+      end
+    }
+  end
+end