diff options
| author | Bryan Jen <bryan.jen@gmail.com> | 2015-09-21 16:33:22 -0700 |
|---|---|---|
| committer | Bryan Jen <bryan.jen@gmail.com> | 2015-09-21 16:33:22 -0700 |
| commit | cebb9f333f4eb80f9782363ebb50cdabcb95b625 (patch) | |
| tree | 50a63ccfca7fb4615fa9c75bbd139534baccca33 /spec/spec_helper_acceptance.rb | |
| parent | 97bd656efbd4ef70bb321f728e0f611fa931ad02 (diff) | |
| parent | b20239e7963a370d4a4eefb5754ddc6a2c072ab9 (diff) | |
| download | puppet-stdlib-cebb9f333f4eb80f9782363ebb50cdabcb95b625.tar.gz puppet-stdlib-cebb9f333f4eb80f9782363ebb50cdabcb95b625.tar.bz2 | |
Merge pull request #528 from mhaskel/is_a_fixes
Update is_a acceptance tests to only run on puppet4
Diffstat (limited to 'spec/spec_helper_acceptance.rb')
| -rwxr-xr-x | spec/spec_helper_acceptance.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index f784112..eda0d1a 100755 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -33,9 +33,13 @@ def is_future_parser_enabled? return false end +def get_puppet_version + (on default, puppet('--version')).output.chomp +end + RSpec.shared_context "with faked facts" do let(:facts_d) do - puppet_version = (on default, puppet('--version')).output.chomp + puppet_version = get_puppet_version if fact('osfamily') =~ /windows/i if fact('kernelmajversion').to_f < 6.0 'C:/Documents and Settings/All Users/Application Data/PuppetLabs/facter/facts.d' |