X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=spec%2Fspec_helper_acceptance_local.rb;h=6f7777c8a998486eccc586d7b3b7e34fa1e13f58;hb=683771de88c9a56b6d5ec3a857fcaf2dfae38628;hp=cc3fc3f99c106ea964065a6a7553c66b1f576d92;hpb=18c44ad278aef0b5644112d21ce1c2d59085b76c;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index cc3fc3f..6f7777c 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -5,16 +5,20 @@ MAX_RETRY_COUNT = 5 RETRY_WAIT = 3 ERROR_MATCHER = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)}.freeze -# lsb-release is needed for facter 3 (puppet 6) to resolve os.distro facts. Not needed with facter -# 4 (puppet 7). -lsb_package = <<-MANIFEST +RSpec.configure do |c| + c.before :suite do + # lsb-release is needed for facter 3 (puppet 6) to resolve os.distro facts. Not needed with facter + # 4 (puppet 7). + lsb_package = <<-MANIFEST package { 'lsb-release': ensure => installed, } MANIFEST - -include PuppetLitmus -apply_manifest(lsb_package) + include PuppetLitmus + extend PuppetLitmus + apply_manifest(lsb_package) + end +end # 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