diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-04-02 17:37:30 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-04-02 18:57:31 -0700 |
| commit | 48ebfcf01eb6c9cd53f14c0360e8f2cd92c72077 (patch) | |
| tree | 4a324daff2242a129209c4539722476140687e4f | |
| parent | 4970d4ef540b7511ed108f74a6c3972cb0ee7764 (diff) | |
| download | chef-skip_ifconfig_ubuntu_2004.tar.gz | |
Skip ifconfig resource testing on Ubuntu 20.04skip_ifconfig_ubuntu_2004
This resource just doesn't make sense on this platform.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | spec/functional/resource/ifconfig_spec.rb | 4 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/spec/functional/resource/ifconfig_spec.rb b/spec/functional/resource/ifconfig_spec.rb index 6bb54d6276..d868774d3e 100644 --- a/spec/functional/resource/ifconfig_spec.rb +++ b/spec/functional/resource/ifconfig_spec.rb @@ -21,9 +21,9 @@ require "functional/resource/base" require "chef/mixin/shell_out" # run this test only for following platforms. -include_flag = !(%w{amazon debian aix}.include?(ohai[:platform_family]) || (ohai[:platform_family] == "rhel" && ohai[:platform_version].to_i < 7)) +include_flag = !(%w{amazon aix}.include?(ohai[:platform_family]) || (ohai[:platform_family] == "rhel" && ohai[:platform_version].to_i < 7 ) || (ohai[:platform_family] == "debian" && ohai[:platform_version].to_f < 20.04 )) -describe Chef::Resource::Ifconfig, :requires_root, :requires_ifconfig, external: include_flag do +describe Chef::Resource::Ifconfig, :requires_root, external: include_flag do include Chef::Mixin::ShellOut let(:new_resource) do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 49e8d2f8f5..82f5b1f601 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -200,7 +200,6 @@ RSpec.configure do |config| # check for particular binaries we need config.filter_run_excluding choco_installed: true unless choco_installed? - config.filter_run_excluding requires_ifconfig: true unless ifconfig? running_platform_arch = `uname -m`.strip unless windows? |