From 858faaf9cd6f0d91781e244f39c165d66b817004 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 26 May 2017 11:52:17 +0200
Subject: [PATCH 1/4] migrate spec_helper to new facts hash

---
 spec/spec_helper_methods.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_methods.rb b/spec/spec_helper_methods.rb
index ab79a2180..bc3d5fb86 100644
--- a/spec/spec_helper_methods.rb
+++ b/spec/spec_helper_methods.rb
@@ -1,5 +1,5 @@
 def os_specific_options(facts)
-  case facts[:osfamily]
+  case facts[:os]['family']
   when 'Gentoo'
     { package: 'app-admin/collectd', service: 'collectd', plugin_conf_dir: '/etc/collectd.d' }
   when 'Solaris'

From 5070afe34a0e59514a2d686b2bb15f239486bd59 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 26 May 2017 11:52:32 +0200
Subject: [PATCH 2/4] unpin concat module

in general we always want to test against latest master, to catch errors
early
---
 .fixtures.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 0e733f0e3..02f876fc1 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -6,7 +6,6 @@ fixtures:
       repo: 'git://github.com/puppetlabs/puppetlabs-stdlib'
     concat:
       repo: 'git://github.com/puppetlabs/puppetlabs-concat'
-      ref: '2.1.0'
     epel:
       repo: 'https://github.com/stahnma/puppet-module-epel'
   symlinks:

From c5e4cbfb537e75127e04d9661fa26ba63e226c89 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 26 May 2017 11:56:46 +0200
Subject: [PATCH 3/4] modulesync 0.21.3

---
 .gitignore                                   |  1 +
 .msync.yml                                   |  2 +-
 .rspec_parallel                              |  1 +
 .rubocop.yml                                 |  6 ++++++
 Gemfile                                      |  1 +
 spec/acceptance/nodesets/archlinux-2-x64.yml | 13 +++++++++++++
 6 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 .rspec_parallel
 create mode 100644 spec/acceptance/nodesets/archlinux-2-x64.yml

diff --git a/.gitignore b/.gitignore
index 0d629b0c1..e9b3cf4bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ Puppetfile.lock
 *.iml
 .*.sw?
 .yardoc/
+Guardfile
diff --git a/.msync.yml b/.msync.yml
index 540f0cea4..4abde2202 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.21.0'
+modulesync_config_version: '0.21.3'
diff --git a/.rspec_parallel b/.rspec_parallel
new file mode 100644
index 000000000..e4d136b75
--- /dev/null
+++ b/.rspec_parallel
@@ -0,0 +1 @@
+--format progress
diff --git a/.rubocop.yml b/.rubocop.yml
index 02f6dd5d6..d92e4e456 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,6 +11,7 @@ AllCops:
     - spec/fixtures/**/*
     - Gemfile
     - Rakefile
+    - Guardfile
 Lint/ConditionPosition:
   Enabled: True
 
@@ -502,6 +503,10 @@ Style/ClosingParenthesisIndentation:
 
 # RSpec
 
+RSpec/BeforeAfterAll:
+  Exclude:
+    - spec/acceptance/**/*
+
 # We don't use rspec in this way
 RSpec/DescribeClass:
   Enabled: False
@@ -524,6 +529,7 @@ RSpec/NestedGroups:
 # this is broken on ruby1.9
 Style/IndentHeredoc:
   Enabled: False
+
 # disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
 Security/YAMLLoad:
   Enabled: false
diff --git a/Gemfile b/Gemfile
index d35336cb5..0914f7cbb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,7 @@ group :test do
   gem 'github_changelog_generator', '~> 1.13.0',                    :require => false if RUBY_VERSION < '2.2.2'
   gem 'rack', '~> 1.0',                                             :require => false if RUBY_VERSION < '2.2.2'
   gem 'github_changelog_generator',                                 :require => false if RUBY_VERSION >= '2.2.2'
+  gem 'parallel_tests',                                             :require => false
 end
 
 group :development do
diff --git a/spec/acceptance/nodesets/archlinux-2-x64.yml b/spec/acceptance/nodesets/archlinux-2-x64.yml
new file mode 100644
index 000000000..89b63003f
--- /dev/null
+++ b/spec/acceptance/nodesets/archlinux-2-x64.yml
@@ -0,0 +1,13 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  archlinux-2-x64:
+    roles:
+      - master
+    platform: archlinux-2-x64
+    box: archlinux/archlinux
+    hypervisor: vagrant
+CONFIG:
+  type: foss

From f860b805d0ebaccec307d625bc209bd6a35647da Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 26 May 2017 18:18:58 +0200
Subject: [PATCH 4/4] stop mocking legacy facts

---
 spec/default_module_facts.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/spec/default_module_facts.yml b/spec/default_module_facts.yml
index c2070ec09..1e90e1a77 100644
--- a/spec/default_module_facts.yml
+++ b/spec/default_module_facts.yml
@@ -1,6 +1,3 @@
 ---
 collectd_version: '5.5.0'
 python_dir: '/usr/local/lib/python2.7/dist-packages'
-operatingsystem: 'Debian'
-lsbdistid: 'Debian'
-lsbdistcodename: 'wheezy'