diff options
author | Travis Fields <cyberious@users.noreply.github.com> | 2014-06-19 15:42:27 -0700 |
---|---|---|
committer | Travis Fields <cyberious@users.noreply.github.com> | 2014-06-19 15:42:27 -0700 |
commit | 7d4fa05da13577072defe991b9de8b96ac4c3be7 (patch) | |
tree | dad3bdeaa8f8240a7443b5a189d4f2d5d9dd07c3 /spec/acceptance/get_module_path_spec.rb | |
parent | e7b27205c4fdc9162f11ee606be93865c1a080ea (diff) | |
parent | 197e2d7e70d6570e82d2056d89de9e5e035b5750 (diff) | |
download | puppet-stdlib-7d4fa05da13577072defe991b9de8b96ac4c3be7.tar.gz puppet-stdlib-7d4fa05da13577072defe991b9de8b96ac4c3be7.tar.bz2 |
Merge pull request #276 from hunner/fm_1587
(FM-1587) Fix test issues on solaris 10
Diffstat (limited to 'spec/acceptance/get_module_path_spec.rb')
-rwxr-xr-x | spec/acceptance/get_module_path_spec.rb | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/spec/acceptance/get_module_path_spec.rb b/spec/acceptance/get_module_path_spec.rb index 34d91fa..6ac690c 100755 --- a/spec/acceptance/get_module_path_spec.rb +++ b/spec/acceptance/get_module_path_spec.rb @@ -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 |