Merge pull request rodjek#19 from GabrielNagy/facter-impl-consistency

Ensure FacterImpl consistency between example groups

lib/rspec-puppet.rb

@@ -43,7 +43,7 @@ def self.current_example
  c.add_setting :default_node_params, :default => {}
  c.add_setting :default_trusted_facts, :default => {}
  c.add_setting :default_trusted_external_data, :default => {}
- c.add_setting :facter_implementation, :default => 'facter'
+ c.add_setting :facter_implementation, :default => :facter
  c.add_setting :hiera_config, :default => Puppet::Util::Platform.actually_windows? ? 'c:/nul/' : '/dev/null'
  c.add_setting :parser, :default => 'current'
  c.add_setting :trusted_node_data, :default => false

lib/rspec-puppet/adapters.rb

@@ -113,12 +113,16 @@ class Adapter40 < Base
  #
  # @api private
  #
- # Set the FacterImpl constant to the given Facter implementation.
- # The method noops if the constant is already set
+ # Set the FacterImpl constant to the given Facter implementation or noop
+ # if the constant is already set. If a proc is given, it will only be
+ # called if FacterImpl is not defined.
  #
- # @param impl [Object]
+ # @param impl [Object, Proc] An object or a proc that implements the Facter API
  def set_facter_impl(impl)
- Object.send(:const_set, :FacterImpl, impl) unless defined? FacterImpl
+ return if defined?(FacterImpl)
+
+ impl = impl.call if impl.is_a?(Proc)
+ Object.send(:const_set, :FacterImpl, impl)
  end
 
  def setup_puppet(example_group)
@@ -237,11 +241,13 @@ def setup_puppet(example_group)
  case RSpec.configuration.facter_implementation.to_sym
  when :rspec
  if supports_facter_runtime?
- Puppet.runtime[:facter] = proc { RSpec::Puppet::FacterTestImpl.new }
- set_facter_impl(Puppet.runtime[:facter])
+ # Lazily instantiate FacterTestImpl here to optimize memory
+ # allocation, as the proc will only be called if FacterImpl is unset
+ set_facter_impl(proc { RSpec::Puppet::FacterTestImpl.new })
+ Puppet.runtime[:facter] = FacterImpl
  else
  warn "Facter runtime implementations are not supported in Puppet #{Puppet.version}, continuing with facter_implementation 'facter'"
- RSpec.configuration.facter_implementation = 'facter'
+ RSpec.configuration.facter_implementation = :facter
  set_facter_impl(Facter)
  end
  when :facter

spec/unit/adapters_spec.rb

@@ -224,6 +224,18 @@ def context_double(options = {})
  expect(FacterImpl).to be_kind_of(RSpec::Puppet::FacterTestImpl)
  end
 
+ it 'ensures consistency of FacterImpl in subsequent example groups' do
+ context = context_double
+
+ # Pretend that FacterImpl is already initialized from a previous example group
+ Puppet.runtime[:facter] = RSpec::Puppet::FacterTestImpl.new
+ Object.send(:const_set, :FacterImpl, Puppet.runtime[:facter])
+
+ allow(RSpec.configuration).to receive(:facter_implementation).and_return('rspec')
+ subject.setup_puppet(context)
+ expect(FacterImpl).to eq(Puppet.runtime[:facter])
+ end
+
  it 'raises if given an unsupported option' do
  context = context_double
  allow(RSpec.configuration).to receive(:facter_implementation).and_return('salam')