From 35b5d6bcc1c0d306eab50280b115e1e3a11671e0 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Fri, 18 Dec 2015 17:38:04 +0000
Subject: Allow package_provider fact to resolve on PE 3.x

PE 3.x emits a puppetversion fact in the format "3.x.x (Puppet Enterprise 3.x.x)". This fact causes an error when invoked on PE 3.x: Could not retrieve fact='package_provider', resolution='<anonymous>': Malformed version number string 3.8.1 (Puppet Enterprise 3.8.1

This fix has been tested on PE 3.8.2 and should work for PE 3.3, 3.7, and 3.8.

Original-fix-by: Alex Harden <aharden@gmail.com>
---
 spec/unit/facter/package_provider_spec.rb | 57 +++++++++++++++++--------------
 1 file changed, 32 insertions(+), 25 deletions(-)

(limited to 'spec/unit')

diff --git a/spec/unit/facter/package_provider_spec.rb b/spec/unit/facter/package_provider_spec.rb
index d1aee94..3954faf 100644
--- a/spec/unit/facter/package_provider_spec.rb
+++ b/spec/unit/facter/package_provider_spec.rb
@@ -7,31 +7,38 @@ describe 'package_provider', :type => :fact do
   before { Facter.clear }
   after { Facter.clear }
 
-  context "darwin" do
-    it "should return pkgdmg" do
-      provider = Puppet::Type.type(:package).provider(:pkgdmg)
-      Puppet::Type.type(:package).stubs(:defaultprovider).returns provider
-
-      expect(Facter.fact(:package_provider).value).to eq('pkgdmg')
-    end
-  end
-
-  context "centos 7" do
-    it "should return yum" do
-      provider = Puppet::Type.type(:package).provider(:yum)
-      Puppet::Type.type(:package).stubs(:defaultprovider).returns provider
-
-      expect(Facter.fact(:package_provider).value).to eq('yum')
+  ['4.2.2', '3.7.1 (Puppet Enterprise 3.2.1)'].each do |puppetversion|
+    describe "on puppet ''#{puppetversion}''" do
+      before :each do
+        Facter.stubs(:value).returns puppetversion
+      end
+
+      context "darwin" do
+        it "should return pkgdmg" do
+          provider = Puppet::Type.type(:package).provider(:pkgdmg)
+          Puppet::Type.type(:package).stubs(:defaultprovider).returns provider
+
+          expect(Facter.fact(:package_provider).value).to eq('pkgdmg')
+        end
+      end
+
+      context "centos 7" do
+        it "should return yum" do
+          provider = Puppet::Type.type(:package).provider(:yum)
+          Puppet::Type.type(:package).stubs(:defaultprovider).returns provider
+
+          expect(Facter.fact(:package_provider).value).to eq('yum')
+        end
+      end
+
+      context "ubuntu" do
+        it "should return apt" do
+          provider = Puppet::Type.type(:package).provider(:apt)
+          Puppet::Type.type(:package).stubs(:defaultprovider).returns provider
+
+          expect(Facter.fact(:package_provider).value).to eq('apt')
+        end
+      end
     end
   end
-
-  context "ubuntu" do
-    it "should return apt" do
-      provider = Puppet::Type.type(:package).provider(:apt)
-      Puppet::Type.type(:package).stubs(:defaultprovider).returns provider
-
-      expect(Facter.fact(:package_provider).value).to eq('apt')
-    end
-  end
-
 end
-- 
cgit v1.2.3