Merge pull request #1074 from fatmcgav/test_fixup_take_2

Fix failing tests on master

Author: Gavin Williams

.travis.yml

@@ -45,70 +45,46 @@ jobs:
   - stage: intake
     env:
     - TASK=intake
-    - PUPPET_VERSION='~> 4.10.0'
-  - env:
-    - TASK=intake
   - env:
     - TASK=intake
     - PUPPET_VERSION='~> 5.0'
-  - env:
-    - TASK=intake
-    - PUPPET_VERSION='~> 6.0'
   - stage: acceptance
     env:
     - TASK=beaker:centos-6-x64:acceptance
   - env:
     - TASK=beaker:centos-6-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:centos-6-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:centos-7-x64:acceptance
   - env:
     - TASK=beaker:centos-7-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:centos-7-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:amazonlinux-1-x64:acceptance
   - env:
     - TASK=beaker:amazonlinux-1-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:amazonlinux-1-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:oracle-6-x64:acceptance
   - env:
     - TASK=beaker:oracle-6-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:oracle-6-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:oracle-7-x64:acceptance
   - env:
     - TASK=beaker:oracle-7-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:oracle-7-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:debian-8-x64:acceptance
   - env:
     - TASK=beaker:debian-8-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:debian-8-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:debian-9-x64:acceptance
   - env:
     - TASK=beaker:debian-9-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:debian-9-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:ubuntu-server-1404-x64:acceptance
   - env:
     - TASK=beaker:ubuntu-server-1404-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:ubuntu-server-1404-x64:acceptance[2.4.6]
   - env:
     - TASK=beaker:ubuntu-server-1604-x64:acceptance
   - env:
     - TASK=beaker:ubuntu-server-1604-x64:acceptance[5.6.9]
-  - env:
-    - TASK=beaker:ubuntu-server-1604-x64:acceptance[2.4.6]
   - stage: snapshots
     env:
     - TASK=beaker:ubuntu-server-1404-x64:snapshot

Gemfile

@@ -1,7 +1,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'puppet', (ENV['PUPPET_VERSION'] || '~> 4.10'), :require => false
+  gem 'puppet', (ENV['PUPPET_VERSION'] || '~> 6.0'), :require => false
 
   gem 'metadata-json-lint'
   gem 'specinfra', '~> 2.60'

Rakefile

@@ -137,7 +137,7 @@ beaker_node_sets.each do |node|
     "beaker:#{node}:acceptance", [:version, :filter] => [:spec_prep]
   ) do |task, args|
     ENV['BEAKER_set'] = node
-    args.with_defaults(:version => '6.2.3', :filter => nil)
+    args.with_defaults(:version => '6.8.6', :filter => nil)
     task.pattern = 'spec/acceptance/tests/acceptance_spec.rb'
     task.rspec_opts = []
     task.rspec_opts << '--format documentation' if ENV['CI'].nil?

spec/spec_helper_acceptance.rb

@@ -57,7 +57,7 @@ def f
 
   # rspec-retry
   c.display_try_failure_messages = true
-  c.default_sleep_interval = 5
+  c.default_sleep_interval = 10
   # General-case retry keyword for unstable tests
   c.around :each, :with_retries do |example|
     example.run_with_retry retry: 4