From 4abd26105486979681c9048ad393967b424b86c0 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Thu, 13 Jun 2024 15:07:55 -0500 Subject: [PATCH] [puppetsync] Don't ignore Puppet 8 failures Puppet 8 failures should not be ignored. Also * Use the correct Ruby version for Puppet 8 tests * Manage spec/spec_helper.rb in Puppet modules --- .github/workflows/pr_tests.yml | 4 +- spec/spec_helper.rb | 78 +++++++++++++++++----------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml index 1780c4a..21ca28c 100644 --- a/.github/workflows/pr_tests.yml +++ b/.github/workflows/pr_tests.yml @@ -115,8 +115,8 @@ jobs: experimental: false - label: 'Puppet 8.x' puppet_version: '~> 8.0' - ruby_version: 3.1 - experimental: true + ruby_version: '3.2' + experimental: false fail-fast: false env: PUPPET_VERSION: ${{matrix.puppet.puppet_version}} diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c5c4c5d..235a136 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,15 @@ +# frozen_string_literal: true +# +# ------------------------------------------------------------------------------ +# NOTICE: **This file is maintained with puppetsync** +# +# This file is automatically updated as part of a puppet module baseline. +# The next baseline sync will overwrite any local changes made to this file. +# ------------------------------------------------------------------------------ + require 'puppetlabs_spec_helper/module_spec_helper' require 'rspec-puppet' +require 'super_diff/rspec' require 'simp/rspec-puppet-facts' include Simp::RspecPuppetFacts @@ -7,22 +17,14 @@ # RSpec Material fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures')) -module_name = File.basename(File.expand_path(File.join(__FILE__,'../..'))) - -# Add fixture lib dirs to LOAD_PATH. Work-around for PUP-3336 -if Puppet.version < "4.0.0" - Dir["#{fixture_path}/modules/*/lib"].entries.each do |lib_dir| - $LOAD_PATH << lib_dir - end -end +module_name = File.basename(File.expand_path(File.join(__FILE__, '../..'))) - -if !ENV.key?( 'TRUSTED_NODE_DATA' ) - warn '== WARNING: TRUSTED_NODE_DATA is unset, using TRUSTED_NODE_DATA=yes' - ENV['TRUSTED_NODE_DATA']='yes' +if ENV['PUPPET_DEBUG'] + Puppet::Util::Log.level = :debug + Puppet::Util::Log.newdestination(:console) end -default_hiera_config =<<-EOM +default_hiera_config = <<~HIERA_CONFIG --- version: 5 hierarchy: @@ -39,7 +41,7 @@ defaults: data_hash: yaml_data datadir: "stub" -EOM +HIERA_CONFIG # This can be used from inside your spec tests to set the testable environment. # You can use this to stub out an ENC. @@ -52,7 +54,7 @@ # end # def set_environment(environment = :production) - RSpec.configure { |c| c.default_facts['environment'] = environment.to_s } + RSpec.configure { |c| c.default_facts['environment'] = environment.to_s } end # This can be used from inside your spec tests to load custom hieradata within @@ -74,39 +76,39 @@ def set_environment(environment = :production) # # Note: Any colons (:) are replaced with underscores (_) in the class name. def set_hieradata(hieradata) - RSpec.configure { |c| c.default_facts['custom_hiera'] = hieradata } + RSpec.configure { |c| c.default_facts['custom_hiera'] = hieradata } end -if not File.directory?(File.join(fixture_path,'hieradata')) then - FileUtils.mkdir_p(File.join(fixture_path,'hieradata')) +unless File.directory?(File.join(fixture_path, 'hieradata')) + FileUtils.mkdir_p(File.join(fixture_path, 'hieradata')) end -if not File.directory?(File.join(fixture_path,'modules',module_name)) then - FileUtils.mkdir_p(File.join(fixture_path,'modules',module_name)) +unless File.directory?(File.join(fixture_path, 'modules', module_name)) + FileUtils.mkdir_p(File.join(fixture_path, 'modules', module_name)) end RSpec.configure do |c| # If nothing else... c.default_facts = { - :production => { + production: { #:fqdn => 'production.rspec.test.localdomain', - :path => '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin', - :concat_basedir => '/tmp' + path: '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin', + concat_basedir: '/tmp' } } c.mock_framework = :rspec - c.mock_with :mocha + c.mock_with :rspec c.module_path = File.join(fixture_path, 'modules') c.manifest_dir = File.join(fixture_path, 'manifests') if c.respond_to?(:manifest_dir) - c.hiera_config = File.join(fixture_path,'hieradata','hiera.yaml') + c.hiera_config = File.join(fixture_path, 'hieradata', 'hiera.yaml') # Useless backtrace noise backtrace_exclusion_patterns = [ - /spec_helper/, - /gems/ + %r{spec_helper}, + %r{gems}, ] if c.respond_to?(:backtrace_exclusion_patterns) @@ -115,9 +117,10 @@ def set_hieradata(hieradata) c.backtrace_clean_patterns = backtrace_exclusion_patterns end + # rubocop:disable RSpec/BeforeAfterAll c.before(:all) do - data = YAML.load(default_hiera_config) - data.keys.each do |key| + data = YAML.safe_load(default_hiera_config) + data.each_key do |key| next unless data[key].is_a?(Hash) if data[key][:datadir] == 'stub' @@ -131,25 +134,27 @@ def set_hieradata(hieradata) f.write data.to_yaml end end + # rubocop:enable RSpec/BeforeAfterAll c.before(:each) do @spec_global_env_temp = Dir.mktmpdir('simpspec') if defined?(environment) set_environment(environment) - FileUtils.mkdir_p(File.join(@spec_global_env_temp,environment.to_s)) + FileUtils.mkdir_p(File.join(@spec_global_env_temp, environment.to_s)) end # ensure the user running these tests has an accessible environmentpath + Puppet[:digest_algorithm] = 'sha256' Puppet[:environmentpath] = @spec_global_env_temp Puppet[:user] = Etc.getpwuid(Process.uid).name Puppet[:group] = Etc.getgrgid(Process.gid).name # sanitize hieradata if defined?(hieradata) - set_hieradata(hieradata.gsub(':','_')) + set_hieradata(hieradata.gsub(':', '_')) elsif defined?(class_name) - set_hieradata(class_name.gsub(':','_')) + set_hieradata(class_name.gsub(':', '_')) end end @@ -163,12 +168,7 @@ def set_hieradata(hieradata) Dir.glob("#{RSpec.configuration.module_path}/*").each do |dir| begin Pathname.new(dir).realpath - rescue - fail "ERROR: The module '#{dir}' is not installed. Tests cannot continue." + rescue StandardError + raise "ERROR: The module '#{dir}' is not installed. Tests cannot continue." end end - -if ENV['PUPPET_DEBUG'] - Puppet::Util::Log.level = :debug - Puppet::Util::Log.newdestination(:console) -end