X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fspec_helper_acceptance.rb;h=4ac8d7e0f632b21341cb394bf10ee599584004c5;hb=bfceb040173244aff36a8bda0cf623e52523c3f3;hp=30eccbf625d362e901791f3bbdb16478f99032f1;hpb=9cb1230c1f5deabe658ca5fc2ab06f70763a8b0b;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 30eccbf..4ac8d7e 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,43 +1,6 @@ -require 'beaker-rspec' -require 'beaker/puppet_install_helper' -require 'beaker/module_install_helper' +# frozen_string_literal: true -run_puppet_install_helper -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'] - -# 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 = 3, retry_wait_interval_secs = 5, error_matcher = nil) - try = 0 - begin - try += 1 - yield - rescue Exception => e - if try < max_retry_count && (error_matcher == nil || e.message =~ error_matcher) - sleep retry_wait_interval_secs - retry - else - raise - end - end -end - -RSpec.configure do |c| - # Project root - proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..')) - - # Readable test descriptions - c.formatter = :documentation -end +PuppetLitmus.configure!