X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=spec%2Fspec_helper_acceptance.rb;h=4ac8d7e0f632b21341cb394bf10ee599584004c5;hb=fcb7ebcdc069bbe0fa7759cecdbb84fe2c0cb8d4;hp=a6f3d853b6115a6f0fbefc97307548f6d7f07607;hpb=ede3eddf3ca5a64ca29c869fba33880b9acdc631;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index a6f3d85..4ac8d7e 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,77 +1,6 @@ -require 'beaker-pe' -require 'beaker-puppet' -require 'beaker-rspec' -require 'beaker/puppet_install_helper' -require 'beaker/module_install_helper' -require 'beaker-task_helper' -require 'beaker/i18n_helper' -require 'beaker-task_helper' +# frozen_string_literal: true -run_puppet_install_helper -configure_type_defaults_on(hosts) -install_bolt_on(hosts) unless pe_install? -install_module_on(hosts) -install_module_dependencies_on(hosts) +require 'puppet_litmus' +require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb')) -UNSUPPORTED_PLATFORMS = ['RedHat', 'Suse', 'windows', 'AIX', 'Solaris'].freeze -MAX_RETRY_COUNT = 12 -RETRY_WAIT = 10 -ERROR_MATCHER = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)} - -# This method allows a block to be passed in and if an exception is raised -# that matches the 'error_matcher' matcher, the block will wait a set number -# of seconds before retrying. -# Params: -# - max_retry_count - Max number of retries -# - retry_wait_interval_secs - Number of seconds to wait before retry -# - error_matcher - Matcher which the exception raised must match to allow retry -# Example Usage: -# retry_on_error_matching(3, 5, /OpenGPG Error/) do -# apply_manifest(pp, :catch_failures => true) -# end -def retry_on_error_matching(max_retry_count = MAX_RETRY_COUNT, retry_wait_interval_secs = RETRY_WAIT, error_matcher = ERROR_MATCHER) - try = 0 - begin - puts "retry_on_error_matching: try #{try}" unless try.zero? - try += 1 - yield - rescue StandardError => e - raise unless try < max_retry_count && (error_matcher.nil? || e.message =~ error_matcher) - sleep retry_wait_interval_secs - retry - end -end - -RSpec.configure do |c| - File.expand_path(File.join(File.dirname(__FILE__), '..')) - - # Readable test descriptions - c.formatter = :documentation - - # Configure all nodes in nodeset - c.before :suite do - run_puppet_access_login(user: 'admin') if pe_install? && (Gem::Version.new(puppet_version) >= Gem::Version.new('5.0.0')) - - hosts.each do |host| - # This will be removed, this is temporary to test localisation. - if (fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat') && - (Gem::Version.new(puppet_version) >= Gem::Version.new('4.10.5') && - Gem::Version.new(puppet_version) < Gem::Version.new('5.2.0')) - on(host, 'mkdir /opt/puppetlabs/puppet/share/locale/ja') - on(host, 'touch /opt/puppetlabs/puppet/share/locale/ja/puppet.po') - end - if fact('osfamily') == 'Debian' - # install language on debian systems - install_language_on(host, 'ja_JP.utf-8') if not_controller(host) - # This will be removed, this is temporary to test localisation. - end - # Required for binding tests. - if fact('osfamily') == 'RedHat' - if fact('operatingsystemmajrelease') =~ %r{7} || fact('operatingsystem') =~ %r{Fedora} - shell('yum install -y bzip2') - end - end - on host, puppet('module', 'install', 'stahnma/epel') - end - end -end +PuppetLitmus.configure!