Skip to content

Commit

Permalink
(FM-1587) Fix test issues on solaris 10
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
hunner committed Jun 19, 2014
1 parent e7b2720 commit 197e2d7
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 21 deletions.
4 changes: 2 additions & 2 deletions spec/acceptance/ensure_packages_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
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|
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/ensure_resource_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
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|
Expand Down
18 changes: 2 additions & 16 deletions spec/acceptance/get_module_path_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,6 @@

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 ? {
Expand All @@ -28,6 +12,8 @@
$o = get_module_path('dne')
if $o == $a {
notify { 'output correct': }
} else {
notify { "failed; module path is '$o'": }
}
EOS

Expand Down
6 changes: 5 additions & 1 deletion spec/acceptance/has_interface_with_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@
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
Expand Down

0 comments on commit 197e2d7

Please sign in to comment.