summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hain <shain@chef.io>2017-11-15 15:19:14 -0800
committerScott Hain <shain@chef.io>2017-11-15 15:19:14 -0800
commitab4f51badd956f41cb4f50726705ed0dc5a3bc25 (patch)
treecf0f83f6b449bd3f6e333e3a597f0b02fdc96cc3
parent5cd0dcd00c9692e3f3f9c189a45a951502a205ef (diff)
downloadchef-ab4f51badd956f41cb4f50726705ed0dc5a3bc25.tar.gz
Switch to platform family, enable correct platforms
Signed-off-by: Scott Hain <shain@chef.io>
-rw-r--r--spec/functional/resource/ifconfig_spec.rb2
-rw-r--r--spec/functional/resource/mount_spec.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/functional/resource/ifconfig_spec.rb b/spec/functional/resource/ifconfig_spec.rb
index d92d06d3bb..acd922e75c 100644
--- a/spec/functional/resource/ifconfig_spec.rb
+++ b/spec/functional/resource/ifconfig_spec.rb
@@ -20,7 +20,7 @@ require "functional/resource/base"
require "chef/mixin/shell_out"
# run this test only for following platforms.
-include_flag = !(%w{fedora amazon redhat centos debian aix}.include?(ohai[:platform]))
+include_flag = !(%w{rhel amazon debian aix}.include?(ohai[:platform_family]))
describe Chef::Resource::Ifconfig, :requires_root, :skip_travis, :external => include_flag do
# This test does not work in travis because there is no eth0
diff --git a/spec/functional/resource/mount_spec.rb b/spec/functional/resource/mount_spec.rb
index df52dad668..fa943f4031 100644
--- a/spec/functional/resource/mount_spec.rb
+++ b/spec/functional/resource/mount_spec.rb
@@ -22,7 +22,7 @@ require "chef/mixin/shell_out"
require "tmpdir"
# run this test only for following platforms.
-include_flag = !(%w{fedora amazon redhat centos debian aix solaris2}.include?(ohai[:platform]))
+include_flag = !(%w{debian rhel amazon aix solaris2}.include?(ohai[:platform_family]))
describe Chef::Resource::Mount, :requires_root, :skip_travis, :external => include_flag do
# Disabled in travis because it refuses to let us mount a ramdisk. /dev/ramX does not
@@ -35,14 +35,14 @@ describe Chef::Resource::Mount, :requires_root, :skip_travis, :external => inclu
def setup_device_for_mount
# use ramdisk for creating a test device for mount.
# This can cleaner if we have chef resource/provider for ramdisk.
- case ohai[:platform]
+ case ohai[:platform_family]
when "aix"
# On AIX, we can't create a ramdisk inside a WPAR, so we use
# a "namefs" mount against / to test
# https://www-304.ibm.com/support/knowledgecenter/ssw_aix_71/com.ibm.aix.performance/namefs_file_sys.htm
device = "/"
fstype = "namefs"
- when "ubuntu", "redhat", "amazon", "fedora", "debian", "centos"
+ when "debian", "rhel", "amazon"
device = "/dev/ram1"
shell_out("ls -1 /dev/ram*").stdout.each_line do |d|
if shell_out("mount | grep #{d}").exitstatus == "1"