summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-08-17 14:37:55 -0700
committerNick Lewis <nick@puppetlabs.com>2011-08-17 14:37:55 -0700
commit99678f26369f7ac57a4125b6b391f2db832bbb4b (patch)
treee229792f899abb7d5aba547a5b0f8ce2cf9882fe /spec
parent3a3a5100305a5334397c350f4e8e42a7f9b7e3f6 (diff)
parent5f22985fa68162a849f15e0ca8125b40529e5769 (diff)
downloadpuppet-99678f26369f7ac57a4125b6b391f2db832bbb4b.tar.gz
puppet-99678f26369f7ac57a4125b6b391f2db832bbb4b.tar.xz
puppet-99678f26369f7ac57a4125b6b391f2db832bbb4b.zip
Merge remote-tracking branch 'josh/maint/2.7.x/ca-location-test-failures' into 2.7.x
Diffstat (limited to 'spec')
-rwxr-xr-xspec/unit/face/node_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/unit/face/node_spec.rb b/spec/unit/face/node_spec.rb
index 6f6edc6cc..4c6b80137 100755
--- a/spec/unit/face/node_spec.rb
+++ b/spec/unit/face/node_spec.rb
@@ -3,6 +3,10 @@ require 'spec_helper'
require 'puppet/face'
describe Puppet::Face[:node, '0.0.1'] do
+ after :all do
+ Puppet::SSL::Host.ca_location = :none
+ end
+
describe '#cleanup' do
it "should clean everything" do
{