diff options
author | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-24 12:03:32 -0700 |
---|---|---|
committer | Hunter Haugen <hunter@puppetlabs.com> | 2014-06-24 12:03:32 -0700 |
commit | 977c6c5bf05ecbde0b8a45c4f747de99cb894255 (patch) | |
tree | 967583b55532d34dc657745a4a52769868500500 | |
parent | 7a796885d5da3a0d52b0e9ed7e25b6afa3fa4256 (diff) | |
parent | ca35be6480a5935a4b0e0721bdb726934269e433 (diff) | |
download | puppet-stdlib-977c6c5bf05ecbde0b8a45c4f747de99cb894255.tar.gz puppet-stdlib-977c6c5bf05ecbde0b8a45c4f747de99cb894255.tar.bz2 |
Merge pull request #287 from hunner/rotate
Fix pe facts and slashes
-rwxr-xr-x | spec/acceptance/fqdn_rotate_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/acceptance/fqdn_rotate_spec.rb b/spec/acceptance/fqdn_rotate_spec.rb index 2527c28..bc02eb6 100755 --- a/spec/acceptance/fqdn_rotate_spec.rb +++ b/spec/acceptance/fqdn_rotate_spec.rb @@ -4,12 +4,12 @@ require 'spec_helper_acceptance' describe 'fqdn_rotate function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do describe 'success' do let(:facts_d) do - if fact('is_pe') == "true" + if fact('is_pe', '--puppet') == "true" if fact('osfamily') =~ /windows/i if fact('kernelmajversion').to_f < 6.0 - 'C:\Documents and Settings\All Users\Application Data\PuppetLabs\facter\facts.d' + 'C:\\Documents and Settings\\All Users\\Application Data\\PuppetLabs\\facter\\facts.d' else - 'C:\ProgramData\PuppetLabs\facter\facts.d' + 'C:\\ProgramData\\PuppetLabs\\facter\\facts.d' end else '/etc/puppetlabs/facter/facts.d' |