opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #276 from hunner/fm_1587

Browse source 
(FM-1587) Fix test issues on solaris 10
This commit is contained in:
Travis Fields 2014-06-19 15:42:27 -07:00
commit 7d4fa05da1
4 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spec/acceptance/ensure_packages_spec.rb
View file

@ -6,8 +6,8 @@ describe 'ensure_packages function', :unless => UNSUPPORTED_PLATFORMS.include?(f
it 'ensure_packages a package' do it 'ensure_packages a package' do
apply_manifest('package { "zsh": ensure => absent, }') apply_manifest('package { "zsh": ensure => absent, }')
pp = <<-EOS pp = <<-EOS
$a = "zsh" $a = "rake"
ensure_packages($a) ensure_packages($a,{'provider' => 'gem'})
EOS EOS
apply_manifest(pp, :expect_changes => true) do |r| apply_manifest(pp, :expect_changes => true) do |r|

4
spec/acceptance/ensure_resource_spec.rb
View file

@ -6,8 +6,8 @@ describe 'ensure_resource function', :unless => UNSUPPORTED_PLATFORMS.include?(f
it 'ensure_resource a package' do it 'ensure_resource a package' do
apply_manifest('package { "zsh": ensure => absent, }') apply_manifest('package { "zsh": ensure => absent, }')
pp = <<-EOS pp = <<-EOS
$a = "zsh" $a = "rake"
ensure_resource('package', $a) ensure_resource('package', $a, {'provider' => 'gem'})
EOS EOS
apply_manifest(pp, :expect_changes => true) do |r| apply_manifest(pp, :expect_changes => true) do |r|

18
spec/acceptance/get_module_path_spec.rb
View file

@ -3,22 +3,6 @@ require 'spec_helper_acceptance'
describe 'get_module_path function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do describe 'get_module_path function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
describe 'success' do describe 'success' do
it 'get_module_paths stdlib' do
pp = <<-EOS
$a = $::is_pe ? {
'true' => '/opt/puppet/share/puppet/modules/stdlib',
'false' => '/etc/puppet/modules/stdlib',
}
$o = get_module_path('stdlib')
if $o == $a {
notify { 'output correct': }
}
EOS
apply_manifest(pp, :catch_failures => true) do |r|
expect(r.stdout).to match(/Notice: output correct/)
end
end
it 'get_module_paths dne' do it 'get_module_paths dne' do
pp = <<-EOS pp = <<-EOS
$a = $::is_pe ? { $a = $::is_pe ? {
@ -28,6 +12,8 @@ describe 'get_module_path function', :unless => UNSUPPORTED_PLATFORMS.include?(f
$o = get_module_path('dne') $o = get_module_path('dne')
if $o == $a { if $o == $a {
notify { 'output correct': } notify { 'output correct': }
} else {
notify { "failed; module path is '$o'": }
} }
EOS EOS

4
spec/acceptance/has_interface_with_spec.rb
View file

@ -27,7 +27,11 @@ describe 'has_interface_with function', :unless => UNSUPPORTED_PLATFORMS.include
end end
it 'has_interface_with existing interface' do it 'has_interface_with existing interface' do
pp = <<-EOS pp = <<-EOS
if $osfamily == 'Solaris' {
$a = 'lo0'
} else {
$a = 'lo' $a = 'lo'
}
$o = has_interface_with($a) $o = has_interface_with($a)
notice(inline_template('has_interface_with is <%= @o.inspect %>')) notice(inline_template('has_interface_with is <%= @o.inspect %>'))
EOS EOS