Cleanups #331
Cleanups #331
Conversation
| on_supported_os.select { |_, f| f[:os]['family'] != 'Solaris' }.each do |os, f| | ||
| context "on #{os}" do | ||
| let(:facts) do | ||
| f.merge(super()) |
There was a problem hiding this comment.
You've reversed the merge operation here, does that still produce the desired output? In the previous implementation, it merged the os specific facts into super() and now it is merging super() into the os facts. This merge will overwrite any duplicate keys in f with the value in super() with this implementation... even nil values.
There was a problem hiding this comment.
Yes, that's intentional. Prior to this, super had defaults that had the os-specific facts added to it. Using rspec-puppet-facts, f has ALL facts, and super() becomes more specific, as it is specific for the current test group.
There was a problem hiding this comment.
👍 Thanks for the explanation.
| @@ -20,6 +20,7 @@ group :development, :unit_tests do | |||
| gem 'puppetlabs_spec_helper', :require => false | |||
| gem 'rspec-puppet', '>= 2.3.2', :require => false | |||
| gem 'simplecov', :require => false | |||
| gem 'rspec-puppet-facts', :require => false | |||
|
@DavidS +1 apart from the alignment |
| %w(lib manifests templates metadata.json).each do |file| | ||
| scp_to host, "#{proj_root}/#{file}", "#{host['distmoduledir']}/ntp" | ||
| end | ||
| copy_module_to(host, :source => proj_root, :module_name => 'ntp') |
|
I'm happy. If no one objects. I will merge when travis has passed. |
No description provided.