Merge pull request #276 from hunner/fm_1587

(FM-1587) Fix test issues on solaris 10
puppetlabs · Jun 19, 2014 · 7d4fa05 · 7d4fa05
2 parents e7b2720 + 197e2d7
commit 7d4fa05
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/spec/acceptance/ensure_packages_spec.rb b/spec/acceptance/ensure_packages_spec.rb
@@ -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|

diff --git a/spec/acceptance/ensure_resource_spec.rb b/spec/acceptance/ensure_resource_spec.rb
@@ -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|

diff --git a/spec/acceptance/get_module_path_spec.rb b/spec/acceptance/get_module_path_spec.rb
@@ -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 ? {
@@ -28,6 +12,8 @@
  $o = get_module_path('dne')
  if $o == $a {
  notify { 'output correct': }
+ } else {
+ notify { "failed; module path is '$o'": }
  }
  EOS
 

diff --git a/spec/acceptance/has_interface_with_spec.rb b/spec/acceptance/has_interface_with_spec.rb
@@ -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