diff options
| -rw-r--r-- | spec/functional/mixin/powershell_out_spec.rb | 8 | ||||
| -rw-r--r-- | spec/functional/resource/group_spec.rb | 33 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 3 | ||||
| -rw-r--r-- | spec/support/platform_helpers.rb | 4 |
4 files changed, 27 insertions, 21 deletions
diff --git a/spec/functional/mixin/powershell_out_spec.rb b/spec/functional/mixin/powershell_out_spec.rb index c0af8ab48e..7fc8dc5957 100644 --- a/spec/functional/mixin/powershell_out_spec.rb +++ b/spec/functional/mixin/powershell_out_spec.rb @@ -22,13 +22,13 @@ describe Chef::Mixin::PowershellOut, windows_only: true do include Chef::Mixin::PowershellOut describe "#powershell_out" do - context "for windows version less than 10", windows_10_or_2016: false do + context "for windows version less than 10", windows_lt_10: true do it "runs a powershell command and collects stdout" do expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+VM\(M\)\s+CPU\(s\)\s+Id\s+/ end end - context "for windows version greater than 10", windows_10_or_2016: true do + context "for windows version greater than 10", windows_gte_10: true do it "runs a powershell command and collects stdout" do expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+CPU\(s\)\s+Id\s+SI\s+ProcessName\s+/ end @@ -40,13 +40,13 @@ describe Chef::Mixin::PowershellOut, windows_only: true do end describe "#powershell_out!" do - context "for windows version less than 10", windows_10_or_2016: false do + context "for windows version less than 10", windows_lt_10: true do it "runs a powershell command and collects stdout" do expect(powershell_out!("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+VM\(M\)\s+CPU\(s\)\s+Id\s+/ end end - context "for windows version less than 10", windows_10_or_2016: true do + context "for windows version less than 10", windows_gte_10: true do it "runs a powershell command and collects stdout" do expect(powershell_out("get-process").run_command.stdout).to match /Handles\s+NPM\(K\)\s+PM\(K\)\s+WS\(K\)\s+CPU\(s\)\s+Id\s+SI\s+ProcessName\s+/ end diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb index 00f0e61a34..03c14382e9 100644 --- a/spec/functional/resource/group_spec.rb +++ b/spec/functional/resource/group_spec.rb @@ -58,7 +58,6 @@ describe Chef::Resource::Group, :requires_root_or_running_windows, :not_supporte when "debian", "fedora", "rhel", "suse", "gentoo", "slackware", "arch" expect { Etc.getgrnam(group) }.to raise_error(ArgumentError, "can't find group for #{group}") when "windows" - sleep(5) expect { Chef::Util::Windows::NetGroup.new(group).local_get_members }.to raise_error(ArgumentError, /The group name could not be found./) end end @@ -336,19 +335,6 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestree" end end end - describe "when group name length is more than 256", :windows_only do - let!(:group_name) do - "theoldmanwalkingdownthestreetalwayshadagood\ -smileonhisfacetheoldmanwalkingdownthestreetalwayshadagoodsmileonhisface\ -theoldmanwalkingdownthestreetalwayshadagoodsmileonhisfacetheoldmanwalking\ -downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" end - - it "should not create a group" do - expect { group_resource.run_action(:create) }.to raise_error(ArgumentError) - group_should_not_exist(group_name) - end - end - # not_supported_on_solaris because of the use of excluded_members describe "should raise an error when same member is included in the members and excluded_members", :not_supported_on_solaris do it "should raise an error" do @@ -360,6 +346,25 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" end end end + # Note:This testcase is written separately from the `group create action` defined above because + # for group name > 256, Windows 2016 returns "The parameter is incorrect" + context "group create action: when group name length is more than 256", :windows_only do + let!(:group_name) do + "theoldmanwalkingdownthestreetalwayshadagood\ +smileonhisfacetheoldmanwalkingdownthestreetalwayshadagoodsmileonhisface\ +theoldmanwalkingdownthestreetalwayshadagoodsmileonhisfacetheoldmanwalking\ +downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" end + + it "should not create a group" do + expect { group_resource.run_action(:create) }.to raise_error(ArgumentError) + if windows_gte_10? + expect { Chef::Util::Windows::NetGroup.new(group_name).local_get_members }.to raise_error(ArgumentError, /The parameter is incorrect./) + else + group_should_not_exist(group_name) + end + end + end + describe "group remove action" do describe "when there is a group" do before do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d40e4dd356..283b8429e5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -146,7 +146,8 @@ RSpec.configure do |config| config.filter_run_excluding :windows64_only => true unless windows64? config.filter_run_excluding :windows32_only => true unless windows32? config.filter_run_excluding :windows_nano_only => true unless windows_nano_server? - config.filter_run_excluding :windows_10_or_2016 => true unless windows_10_or_2016? + config.filter_run_excluding :windows_gte_10 => true unless windows_gte_10? + config.filter_run_excluding :windows_lt_10 => true if windows_gte_10? config.filter_run_excluding :ruby64_only => true unless ruby_64bit? config.filter_run_excluding :ruby32_only => true unless ruby_32bit? config.filter_run_excluding :windows_powershell_dsc_only => true unless windows_powershell_dsc? diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb index 5f438e69c1..193d8243dc 100644 --- a/spec/support/platform_helpers.rb +++ b/spec/support/platform_helpers.rb @@ -67,9 +67,9 @@ def windows_2012r2? (host_version && host_version.start_with?("6.3")) end -def windows_10_or_2016? +def windows_gte_10? return false unless windows? - (host_version && host_version.start_with?("10.0")) + Gem::Requirement.new(">= 10").satisfied_by?(Gem::Version.new(host_version)) end def host_version |