diff options
| author | Paul Lathrop <paul@tertiusfamily.net> | 2008-05-21 18:29:25 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-05-23 04:19:59 +1000 |
| commit | bdcf5db3cea4a4009839087c1b502dcce24eddd7 (patch) | |
| tree | 39fe719b4a094b6b8bd5cd44af29f034d6876d3c /spec/unit/network | |
| parent | d55a75525ad931aaeab87fd9173f9e92df000ed9 (diff) | |
Fixing tests that are broken when running as root under OSX 10.5
Diffstat (limited to 'spec/unit/network')
| -rw-r--r-- | spec/unit/network/client.rb | 2 | ||||
| -rwxr-xr-x | spec/unit/network/client/master.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/spec/unit/network/client.rb b/spec/unit/network/client.rb index bc41efb4f..e9467aad0 100644 --- a/spec/unit/network/client.rb +++ b/spec/unit/network/client.rb @@ -9,8 +9,10 @@ require 'puppet/network/client' describe Puppet::Network::Client do before do + Puppet.settings.stubs(:use).returns(true) Puppet::Network::HttpPool.stubs(:cert_setup) end + describe "when keep-alive is enabled" do before do Puppet::Network::HttpPool.stubs(:keep_alive?).returns true diff --git a/spec/unit/network/client/master.rb b/spec/unit/network/client/master.rb index c0ad7562f..79ab8c86f 100755 --- a/spec/unit/network/client/master.rb +++ b/spec/unit/network/client/master.rb @@ -8,6 +8,7 @@ require 'puppet/network/client/master' describe Puppet::Network::Client::Master, " when retrieving the catalog" do before do + Puppet.settings.stubs(:use).returns(true) @master = mock 'master' @client = Puppet::Network::Client.master.new( :Master => @master @@ -218,6 +219,7 @@ end describe Puppet::Network::Client::Master, " when using the cached catalog" do before do + Puppet.settings.stubs(:use).returns(true) @master = mock 'master' @client = Puppet::Network::Client.master.new( :Master => @master |