summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-08-22 14:53:22 -0700
committerNick Lewis <nick@puppetlabs.com>2011-08-22 14:53:22 -0700
commit4684db12b1ca27df4d612fb1a54b7be43f54a6a8 (patch)
tree498de431f2ada8b549b4c7e563fbe6a0ec8d152b
parent299932691c7a67c93275e978c52132ff99cae4f5 (diff)
parent9f39cc476246e307ec4d8861502c1d5b8ce1bc21 (diff)
downloadpuppet-4684db12b1ca27df4d612fb1a54b7be43f54a6a8.tar.gz
puppet-4684db12b1ca27df4d612fb1a54b7be43f54a6a8.tar.xz
puppet-4684db12b1ca27df4d612fb1a54b7be43f54a6a8.zip
Merge pull request #52 from joshcooper/maint/2.7.x/ssl-file-spec-test-failure
Maint/2.7.x/ssl file spec test failure
-rwxr-xr-xspec/unit/indirector/ssl_file_spec.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/unit/indirector/ssl_file_spec.rb b/spec/unit/indirector/ssl_file_spec.rb
index e0e30bd9d..8ee19c8c8 100755
--- a/spec/unit/indirector/ssl_file_spec.rb
+++ b/spec/unit/indirector/ssl_file_spec.rb
@@ -19,7 +19,7 @@ describe Puppet::Indirector::SslFile do
@setting = :certdir
@file_class.store_in @setting
- @path = make_absolute("/tmp/my_directory")
+ @path = make_absolute("/thisdoesntexist/my_directory")
Puppet[:noop] = false
Puppet[@setting] = @path
Puppet[:trace] = false
@@ -43,7 +43,9 @@ describe Puppet::Indirector::SslFile do
it "should fail if no store directory or file location has been set" do
@file_class.store_in nil
@file_class.store_at nil
- lambda { @file_class.new }.should raise_error(Puppet::DevError)
+ FileTest.expects(:exists?).with(File.dirname(@path)).at_least(0).returns(true)
+ Dir.stubs(:mkdir).with(@path)
+ lambda { @file_class.new }.should raise_error(Puppet::DevError, /No file or directory setting provided/)
end
describe "when managing ssl files" do