aboutsummaryrefslogtreecommitdiff
path: root/spec/unit/parser/functions
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-17 21:43:33 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-17 21:43:33 -0200
commitca79037957522708830ae159b6cc7a05edbac340 (patch)
treee645830cf13393af8b0ad5e097bb260ded2ef20e /spec/unit/parser/functions
parent85d7fc922011bc2a619f0e093b69f0a37a88f59c (diff)
parent576bbf09d8516809d7373dc9b4e725ce2151a463 (diff)
downloadpuppet-sshd-ca79037957522708830ae159b6cc7a05edbac340.tar.gz
puppet-sshd-ca79037957522708830ae159b6cc7a05edbac340.tar.bz2
Merge branch 'master' of git://labs.riseup.net/shared-sshd
Conflicts: templates/sshd_config/Ubuntu_precise.erb
Diffstat (limited to 'spec/unit/parser/functions')
-rw-r--r--spec/unit/parser/functions/ssh_keygen.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/parser/functions/ssh_keygen.rb b/spec/unit/parser/functions/ssh_keygen.rb
index f830065..da45779 100644
--- a/spec/unit/parser/functions/ssh_keygen.rb
+++ b/spec/unit/parser/functions/ssh_keygen.rb
@@ -74,7 +74,7 @@ describe "the ssh_keygen function" do
File.stubs(:exists?).with("/tmp/a/b/c").returns(false)
File.stubs(:exists?).with("/tmp/a/b/c.pub").returns(false)
File.stubs(:directory?).with("/tmp/a/b").returns(false)
- Puppet::Util.expects(:recmkdir).with("/tmp/a/b",0700)
+ FileUtils.expects(:mkdir_p).with("/tmp/a/b", :mode => 0700)
Puppet::Util.expects(:execute).returns("")
result = @scope.function_ssh_keygen('/tmp/a/b/c')
result.length.should == 2