From 326e6eb64d463aee2e0889b7adbae5696ba3ab6f Mon Sep 17 00:00:00 2001 From: nimisha Date: Thu, 15 Jun 2017 17:44:17 +0530 Subject: Fixing build failures of Windows Server 2016 Signed-off-by: nimisha --- spec/functional/mixin/powershell_out_spec.rb | 24 ++++++++++++++++++++---- spec/functional/resource/group_spec.rb | 1 + 2 files changed, 21 insertions(+), 4 deletions(-) (limited to 'spec/functional') diff --git a/spec/functional/mixin/powershell_out_spec.rb b/spec/functional/mixin/powershell_out_spec.rb index 66214cb0c7..c0af8ab48e 100644 --- a/spec/functional/mixin/powershell_out_spec.rb +++ b/spec/functional/mixin/powershell_out_spec.rb @@ -22,8 +22,16 @@ describe Chef::Mixin::PowershellOut, windows_only: true do include Chef::Mixin::PowershellOut describe "#powershell_out" 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+/ + context "for windows version less than 10", windows_10_or_2016: false 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 + 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 end it "does not raise exceptions when the command is invalid" do @@ -32,8 +40,16 @@ describe Chef::Mixin::PowershellOut, windows_only: true do end describe "#powershell_out!" 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+/ + context "for windows version less than 10", windows_10_or_2016: false 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 + 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 end it "raises exceptions when the command is invalid" do diff --git a/spec/functional/resource/group_spec.rb b/spec/functional/resource/group_spec.rb index 7effd386a4..00f0e61a34 100644 --- a/spec/functional/resource/group_spec.rb +++ b/spec/functional/resource/group_spec.rb @@ -58,6 +58,7 @@ 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 -- cgit v1.2.1