diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:47:48 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:47:48 -0700 |
| commit | 9cc15a650a7950538c86a9ac3ba8ba7e2eb145ba (patch) | |
| tree | d77590b842275ab493ab304f681d5ac7a296496a | |
| parent | 4004a758b0c01ac17206a838f91f8cf5c57cc466 (diff) | |
| parent | 614b3fbf6c15893e89ed8654fb85596223b5b7c5 (diff) | |
Merge branch '3.1.x' into 3.x
* 3.1.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 |