summaryrefslogtreecommitdiffstats
path: root/spec/unit/util
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-08-17 17:44:43 -0700
committerNick Lewis <nick@puppetlabs.com>2011-08-17 17:44:43 -0700
commit0d51dc9be0bc1c785d749b8b352a1e43b1b6e9c6 (patch)
treee68fe71567fd1f21b5e0561636f81605163d3b7d /spec/unit/util
parentcf95530964a067374f2ff8be0602342e47a55cc5 (diff)
parentaf87f32a016a5ed48353f516f9558f95c54c50b4 (diff)
downloadpuppet-0d51dc9be0bc1c785d749b8b352a1e43b1b6e9c6.tar.gz
puppet-0d51dc9be0bc1c785d749b8b352a1e43b1b6e9c6.tar.xz
puppet-0d51dc9be0bc1c785d749b8b352a1e43b1b6e9c6.zip
Merge remote-tracking branch 'josh/maint/master/resource_and_suidmanager_specs'
Diffstat (limited to 'spec/unit/util')
-rwxr-xr-xspec/unit/util/suidmanager_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/unit/util/suidmanager_spec.rb b/spec/unit/util/suidmanager_spec.rb
index fc70e1718..abfe3f723 100755
--- a/spec/unit/util/suidmanager_spec.rb
+++ b/spec/unit/util/suidmanager_spec.rb
@@ -33,6 +33,7 @@ describe Puppet::Util::SUIDManager do
describe "#asuser" do
it "should set euid/egid when root" do
Process.stubs(:uid).returns(0)
+ Puppet.features.stubs(:microsoft_windows?).returns(false)
Process.stubs(:egid).returns(51)
Process.stubs(:euid).returns(50)
@@ -168,6 +169,8 @@ describe Puppet::Util::SUIDManager do
describe "with #system" do
it "should set euid/egid when root" do
Process.stubs(:uid).returns(0)
+ Puppet.features.stubs(:microsoft_windows?).returns(false)
+
Process.stubs(:egid).returns(51)
Process.stubs(:euid).returns(50)