Merge a17c83c into 7d7b678

puppetlabs · Oct 31, 2018 · 6c06a8a · 6c06a8a
2 parents 7d7b678 + a17c83c
commit 6c06a8a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/acceptance/lib/facter/acceptance/base_fact_utils.rb b/acceptance/lib/facter/acceptance/base_fact_utils.rb
@@ -227,9 +227,9 @@ def el_expected_facts(agent)
             'os.family'                => 'RedHat',
             'os.hardware'              => os_hardware,
             'os.name'                  => os_name,
-            'os.release.full'          => /#{os_version}\.\d+(\.\d+)?/,
+            'os.release.full'          => /#{os_version}(\.\d+)?(\.\d+)?/,
             'os.release.major'         => os_version,
-            'os.release.minor'         => /\d+/,
+            'os.release.minor'         => /(\d+)?/,
             'processors.count'         => /[1-9]/,
             'processors.physicalcount' => /[1-9]/,
             'processors.isa'           => os_hardware,

diff --git a/acceptance/lib/helper.rb b/acceptance/lib/helper.rb
@@ -1 +1,3 @@
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+
+require 'beaker-puppet'
diff --git a/acceptance/tests/facts/networking_facts.rb b/acceptance/tests/facts/networking_facts.rb
@@ -26,12 +26,12 @@
     refute_empty(primary_interface)
 
     expected_bindings = {
-        "\"networking.interfaces.#{primary_interface}.bindings.0.address\"" => @ip_regex,
-        "\"networking.interfaces.#{primary_interface}.bindings.0.netmask\"" => @netmask_regex,
-        "\"networking.interfaces.#{primary_interface}.bindings.0.network\"" => @ip_regex,
-        "\"networking.interfaces.#{primary_interface}.bindings6.0.address\"" => /[a-f0-9:]+/,
-        "\"networking.interfaces.#{primary_interface}.bindings6.0.netmask\"" => /[a-f0-9:]+/,
-        "\"networking.interfaces.#{primary_interface}.bindings6.0.network\"" => /[a-f0-9:]+/
+        "networking.interfaces.#{primary_interface}.bindings.0.address" => @ip_regex,
+        "networking.interfaces.#{primary_interface}.bindings.0.netmask" => @netmask_regex,
+        "networking.interfaces.#{primary_interface}.bindings.0.network" => @ip_regex,
+        "networking.interfaces.#{primary_interface}.bindings6.0.address" => /[a-f0-9:]+/,
+        "networking.interfaces.#{primary_interface}.bindings6.0.netmask" => /[a-f0-9:]+/,
+        "networking.interfaces.#{primary_interface}.bindings6.0.network" => /[a-f0-9:]+/
     }
 
     if agent['platform'] =~ /eos|solaris|aix|cisco/
@@ -41,9 +41,9 @@
       expected_networking.delete("networking.network6")
 
       #remove invalid bindings for the primary networking interface eccentric platforms
-      expected_bindings.delete("\"networking.interfaces.#{primary_interface}.bindings6.0.address\"")
-      expected_bindings.delete("\"networking.interfaces.#{primary_interface}.bindings6.0.netmask\"")
-      expected_bindings.delete("\"networking.interfaces.#{primary_interface}.bindings6.0.network\"")
+      expected_bindings.delete("networking.interfaces.#{primary_interface}.bindings6.0.address")
+      expected_bindings.delete("networking.interfaces.#{primary_interface}.bindings6.0.netmask")
+      expected_bindings.delete("networking.interfaces.#{primary_interface}.bindings6.0.network")
     end
 
     if agent['platform'] =~ /aix|sparc|cisco|huawei|sles|s390x/
@@ -57,19 +57,19 @@
       expected_networking.delete("networking.netmask")
 
       #remove invalid bindings for Cisco's primary networking interface
-      expected_bindings.delete("\"networking.interfaces.#{primary_interface}.bindings.0.netmask\"")
-      expected_bindings.delete("\"networking.interfaces.#{primary_interface}.bindings.0.network\"")
+      expected_bindings.delete("networking.interfaces.#{primary_interface}.bindings.0.netmask")
+      expected_bindings.delete("networking.interfaces.#{primary_interface}.bindings.0.network")
     end
 
     step "Ensure the Networking fact resolves with reasonable values for at least one interface" do
       expected_networking.each do |fact, value|
-        assert_match(value, fact_on(agent, fact))
+        assert_match(value, fact_on(agent, fact).to_s)
       end
     end
 
     step "Ensure bindings for the primary networking interface are present" do
       expected_bindings.each do |fact, value|
-        assert_match(value, fact_on(agent, fact))
+        assert_match(value, fact_on(agent, fact).to_s)
       end
     end
   end