From f05f78e33cd286ab5e7207558244dd0dbf766d4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <raphael.pinson@camptocamp.com>
Date: Thu, 5 Jan 2017 12:41:31 +0100
Subject: [PATCH] Modulesync: remove Puppet 3 tests

---
 .travis.yml                           |  8 +-------
 Gemfile                               | 10 +++++-----
 spec/acceptance/nodesets/centos-7.yml |  2 +-
 spec/spec_helper.rb                   |  2 --
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 92d25c3..5e132df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,14 +13,8 @@ script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.9
-    env: PUPPET_GEM_VERSION="~> 4.5.0"
+    env: PUPPET_GEM_VERSION="~> 4.0"
   - rvm: 2.3.1
     env: PUPPET_GEM_VERSION="~> 4"
   - rvm: default
diff --git a/Gemfile b/Gemfile
index 7a15ede..377d0c1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,11 +25,11 @@ group :development, :unit_tests do
 end
 
 group :system_tests do
-  gem 'beaker',              :require => false
-  gem 'beaker-rspec',        :require => false
-  gem 'beaker_spec_helper',  :require => false
-  gem 'serverspec',          :require => false
-  gem 'specinfra',           :require => false
+  gem 'beaker',               :require => false
+  gem 'beaker-rspec', '> 5',  :require => false
+  gem 'beaker_spec_helper',   :require => false
+  gem 'serverspec',           :require => false
+  gem 'specinfra',            :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
diff --git a/spec/acceptance/nodesets/centos-7.yml b/spec/acceptance/nodesets/centos-7.yml
index bc57539..a8fa468 100644
--- a/spec/acceptance/nodesets/centos-7.yml
+++ b/spec/acceptance/nodesets/centos-7.yml
@@ -9,7 +9,7 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/usr/sbin/init"]'
     docker_image_commands:
-      - 'yum install -y crontabs tar wget'
+      - 'yum install -y crontabs tar wget iproute'
 CONFIG:
   type: aio
   log_level: debug
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b8e6747..94d30d5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -24,8 +24,6 @@ require 'pathname'
 dir = Pathname.new(__FILE__).parent
 Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules')
 
-RSpec::Expectations.configuration.on_potential_false_positives = :nothing
-
 # There's no real need to make this version dependent, but it helps find
 # regressions in Puppet
 #
-- 
GitLab