Skip to content

(FM-1587) Fix test issues on solaris 10 #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 19, 2014
Merged

(FM-1587) Fix test issues on solaris 10 #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions spec/acceptance/ensure_packages_spec.rb
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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