diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/default_facts.yml | 7 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 5 | ||||
| -rw-r--r-- | spec/spec_helper_acceptance.rb | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/spec/default_facts.yml b/spec/default_facts.yml index f777abf..3346c39 100644 --- a/spec/default_facts.yml +++ b/spec/default_facts.yml @@ -2,7 +2,8 @@ # # Facts specified here will override the values provided by rspec-puppet-facts. --- -ipaddress: "172.16.254.254" -ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA" +networking: + ip: "172.16.254.254" + ip6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA" + mac: "AA:AA:AA:AA:AA:AA" is_pe: false -macaddress: "AA:AA:AA:AA:AA:AA" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9b1fa6f..6820ceb 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -25,8 +25,8 @@ default_fact_files.each do |f| next unless File.exist?(f) && File.readable?(f) && File.size?(f) begin - default_facts.merge!(YAML.safe_load(File.read(f), [], [], true)) - rescue => e + default_facts.merge!(YAML.safe_load(File.read(f), permitted_classes: [], permitted_symbols: [], aliases: true)) + rescue StandardError => e RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}" end end @@ -46,6 +46,7 @@ RSpec.configure do |c| end c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT'] c.after(:suite) do + RSpec::Puppet::Coverage.report!(0) end # Filter backtrace noise diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index e22dc87..633ed4b 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,5 +1,6 @@ require 'puppet' require 'beaker-rspec' +require 'beaker-puppet' require 'beaker/module_install_helper' require 'beaker/puppet_install_helper' require 'voxpupuli/acceptance/spec_helper_acceptance' @@ -17,6 +18,7 @@ end RSpec.configure do |c| c.before :suite do unless ENV['BEAKER_provision'] == 'no' + hosts.each { |host| host[:type] = 'aio' } run_puppet_install_helper install_module_on(hosts) install_module_dependencies_on(hosts) |