diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:48:01 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:48:01 -0700 |
| commit | aa22cded089d0d33cfd840c27caac48cee7a9013 (patch) | |
| tree | 00c785f00404accff28e49f21ba7ed55b375577b | |
| parent | efb0a85b41b390e14aece19e4473d1171fe64126 (diff) | |
| parent | 18212dca014d74ecc63c4e1059f7d93d9b0204fe (diff) | |
| download | puppet-stdlib-aa22cded089d0d33cfd840c27caac48cee7a9013.tar.gz puppet-stdlib-aa22cded089d0d33cfd840c27caac48cee7a9013.tar.bz2 | |
Merge branch '4.x'
* 4.x:
Revert "Revert "Merge branch '2.5.x' into 3.0.x""
Revert "Merge branch '2.5.x' into 3.0.x"
(maint) Fix spec failures resulting from Facter API changes
| -rw-r--r-- | spec/unit/facter/pe_version_spec.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/spec/unit/facter/pe_version_spec.rb b/spec/unit/facter/pe_version_spec.rb index 202a0e5..931c6d4 100644 --- a/spec/unit/facter/pe_version_spec.rb +++ b/spec/unit/facter/pe_version_spec.rb @@ -4,7 +4,15 @@ require 'spec_helper' describe "PE Version specs" do before :each do - Facter.collection.loader.load(:pe_version) + # Explicitly load the pe_version.rb file which contains generated facts + # that cannot be automatically loaded. Puppet 2.x implements + # Facter.collection.load while Facter 1.x markes Facter.collection.load as + # a private method. + if Facter.collection.respond_to? :load + Facter.collection.load(:pe_version) + else + Facter.collection.loader.load(:pe_version) + end end context "If PE is installed" do |