summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-05-07 14:45:13 -0500
committerLuke Kanies <luke@madstop.com>2008-05-07 14:45:13 -0500
commite936ef2426464b901638bf338c1c42590245b58f (patch)
tree2ba78ca3e29c0dc63a115ae0191b7c74e7829dab /lib
parent1cfb0215a4d56af9ac1e0c672d9ae597dfde846e (diff)
downloadpuppet-e936ef2426464b901638bf338c1c42590245b58f.tar.gz
puppet-e936ef2426464b901638bf338c1c42590245b58f.tar.xz
puppet-e936ef2426464b901638bf338c1c42590245b58f.zip
Fixing some broken tests.
The HttpPool module now removes its cached ssl_host instance when clearing its cache. This is really only useful for testing, but it correctly causes the pool to use new certificates when they're available.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/network/http_pool.rb1
-rw-r--r--lib/puppet/type/file.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb
index 24cbee656..cf17a8380 100644
--- a/lib/puppet/network/http_pool.rb
+++ b/lib/puppet/network/http_pool.rb
@@ -33,6 +33,7 @@ module Puppet::Network::HttpPool
@http_cache.clear
@cert = nil
@key = nil
+ @ssl_host = nil
end
# Make sure we set the driver up when we read the cert in.
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index 7b9233736..ef010efda 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -796,7 +796,6 @@ module Puppet
# a wrapper method to make sure the file exists before doing anything
def retrieve
unless stat = self.stat(true)
- self.debug "File does not exist"
# If the file doesn't exist but we have a source, then call
# retrieve on that property