puppet/ssh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Work with Phil on PR

Browse Source 
Numbers are treated as strings, so removed those from the test.
Simplified validation of sshd_config_forcecommand to simply check if it
is a string.
This commit is contained in:
Garrett Honeycutt 2015-04-07 13:55:49 -04:00
parent bc15c75c77
commit 80f77a2000
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -460,9 +460,7 @@ class ssh (
} }
if $sshd_config_forcecommand != undef { if $sshd_config_forcecommand != undef {
if is_string($sshd_config_forcecommand) == false { validate_string($sshd_config_forcecommand)
fail("ssh::sshd_config_forcecommand must be a string. Detected value is ${sshd_config_forcecommand}.")
}
} }
if $sshd_config_match != undef { if $sshd_config_match != undef {

4
spec/classes/init_spec.rb
View File

@ -1120,14 +1120,14 @@ describe 'ssh' do
end end
end end
[true,3,2.42,['array'],a = { 'ha' => 'sh' }].each do |value| [true,['array'],a = { 'ha' => 'sh' }].each do |value|
context "set to invalid #{value} (as #{value.class})" do context "set to invalid #{value} (as #{value.class})" do
let (:params) {{'sshd_config_forcecommand' => value }} let (:params) {{'sshd_config_forcecommand' => value }}
it 'should fail' do it 'should fail' do
expect { expect {
should should
}.to raise_error(Puppet::Error, /ssh::sshd_config_forcecommand must be a string. Detected value is #{value}/) }.to raise_error(Puppet::Error, /is not a string/)
end end
end end
end end