(FM-1587) Fix test issues on solaris 10
- ensure_packages fails because Error: Sun packages must specify a package source - ensure_resource fails for the same reason - get_module_path fails because the modulepath is different - has_interface_with fails because the interface is lo0 not lo
This commit is contained in:
parent
e7b27205c4
commit
197e2d7e70
4 changed files with 11 additions and 21 deletions
|
@ -6,8 +6,8 @@ describe 'ensure_packages function', :unless => UNSUPPORTED_PLATFORMS.include?(f
|
|||
it 'ensure_packages a package' do
|
||||
apply_manifest('package { "zsh": ensure => absent, }')
|
||||
pp = <<-EOS
|
||||
$a = "zsh"
|
||||
ensure_packages($a)
|
||||
$a = "rake"
|
||||
ensure_packages($a,{'provider' => 'gem'})
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :expect_changes => true) do |r|
|
||||
|
|
|
@ -6,8 +6,8 @@ describe 'ensure_resource function', :unless => UNSUPPORTED_PLATFORMS.include?(f
|
|||
it 'ensure_resource a package' do
|
||||
apply_manifest('package { "zsh": ensure => absent, }')
|
||||
pp = <<-EOS
|
||||
$a = "zsh"
|
||||
ensure_resource('package', $a)
|
||||
$a = "rake"
|
||||
ensure_resource('package', $a, {'provider' => 'gem'})
|
||||
EOS
|
||||
|
||||
apply_manifest(pp, :expect_changes => true) do |r|
|
||||
|
|
|
@ -3,22 +3,6 @@ require 'spec_helper_acceptance'
|
|||
|
||||
describe 'get_module_path function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) 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
|
||||
pp = <<-EOS
|
||||
$a = $::is_pe ? {
|
||||
|
@ -28,6 +12,8 @@ describe 'get_module_path function', :unless => UNSUPPORTED_PLATFORMS.include?(f
|
|||
$o = get_module_path('dne')
|
||||
if $o == $a {
|
||||
notify { 'output correct': }
|
||||
} else {
|
||||
notify { "failed; module path is '$o'": }
|
||||
}
|
||||
EOS
|
||||
|
||||
|
|
|
@ -27,7 +27,11 @@ describe 'has_interface_with function', :unless => UNSUPPORTED_PLATFORMS.include
|
|||
end
|
||||
it 'has_interface_with existing interface' do
|
||||
pp = <<-EOS
|
||||
$a = 'lo'
|
||||
if $osfamily == 'Solaris' {
|
||||
$a = 'lo0'
|
||||
} else {
|
||||
$a = 'lo'
|
||||
}
|
||||
$o = has_interface_with($a)
|
||||
notice(inline_template('has_interface_with is <%= @o.inspect %>'))
|
||||
EOS
|
||||
|
|
Loading…
Reference in a new issue