Control: tags -1 fixed-upstream patch

Please find a patch for this attached.
Origin: upstream, 578ea82edde44160bbbcc48f537cb367702cc37f
From: Tim Smith <[email protected]>
Date: Wed, 7 Apr 2021 16:48:19 -0700
Subject: Fix failing Fauxhai related specs

Don't specify exact versions. Let fauxhai do what it does

Signed-off-by: Tim Smith <[email protected]>
---
 chef-utils/spec/unit/dsl/platform_family_spec.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- a/spec/unit/dsl/platform_family_spec.rb
+++ b/spec/unit/dsl/platform_family_spec.rb
@@ -90,13 +90,13 @@ def pf_reports_true_for(*args)
   end
 
   context "on centos6" do
-    let(:options) { { platform: "centos", version: "6.10" } }
+    let(:options) { { platform: "centos", version: "6" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end
 
   context "on centos7" do
-    let(:options) { { platform: "centos", version: "7.7.1908" } }
+    let(:options) { { platform: "centos", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end
@@ -108,7 +108,7 @@ def pf_reports_true_for(*args)
   end
 
   context "on clearos7" do
-    let(:options) { { platform: "clearos", version: "7.4" } }
+    let(:options) { { platform: "clearos", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end
@@ -156,25 +156,25 @@ def pf_reports_true_for(*args)
   end
 
   context "on oracle6" do
-    let(:options) { { platform: "oracle", version: "6.10" } }
+    let(:options) { { platform: "oracle", version: "6" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end
 
   context "on oracle7" do
-    let(:options) { { platform: "oracle", version: "7.6" } }
+    let(:options) { { platform: "oracle", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end
 
   context "on redhat6" do
-    let(:options) { { platform: "redhat", version: "6.10" } }
+    let(:options) { { platform: "redhat", version: "6" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel6?)
   end
 
   context "on redhat7" do
-    let(:options) { { platform: "redhat", version: "7.6" } }
+    let(:options) { { platform: "redhat", version: "7" } }
 
     pf_reports_true_for(:rhel?, :rpm_based?, :fedora_derived?, :redhat_based?, :el?, :rhel7?)
   end

Reply via email to