Switch to voxpupuli-acceptance-1.0

Gemfile

@@ -17,7 +17,7 @@ gem 'voxpupuli-test', '~> 1.4'
 gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
 gem 'puppet_metadata', '~> 0.3'
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
-gem 'voxpupuli-acceptance', '~> 0.3', {"groups"=>["system_tests"]}
+gem 'voxpupuli-acceptance', '~> 1.0', {"groups"=>["system_tests"]}
 gem 'hocon'
 
 # vim:ft=ruby

spec/acceptance/hieradata/common.yaml

@@ -0,0 +1,8 @@
+---
+puppet::server_foreman: false
+puppet::server_reports: 'store'
+puppet::server_external_nodes: ''
+# only for install test - don't think to use this in production!
+# https://docs.puppet.com/puppetserver/latest/tuning_guide.html
+puppet::server_jvm_max_heap_size: '256m'
+puppet::server_jvm_min_heap_size: '256m'

spec/acceptance/puppet_spec.rb

@@ -5,9 +5,9 @@
     on default, puppet('resource', 'service', 'puppet', 'ensure=stopped', 'enable=false')
   end
 
-  let(:pp) { 'include puppet' }
-
-  it_behaves_like 'a idempotent resource'
+  it_behaves_like 'an idempotent resource' do
+    let(:manifest) { 'include puppet' }
+  end
 
   describe service('puppet') do
     it { is_expected.to be_running }

spec/acceptance/puppetserver_config_spec.rb

@@ -14,24 +14,17 @@
   end
 
   describe 'server_max_open_files' do
-    let(:pp) do
-      <<-MANIFEST
-      class { '::puppet':
-        server                   => true,
-        server_foreman           => false,
-        server_reports           => 'store',
-        server_external_nodes    => '',
-        # only for install test - don't think to use this in production!
-        # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
-        server_jvm_max_heap_size => '256m',
-        server_jvm_min_heap_size => '256m',
-        server_max_open_files    => 32143,
-      }
-      MANIFEST
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-MANIFEST
+        class { 'puppet':
+          server                => true,
+          server_max_open_files => 32143,
+        }
+        MANIFEST
+      end
     end
 
-    it_behaves_like 'a idempotent resource'
-
     # pgrep -f java.*puppetserver would be better. But i cannot get it to work. Shellwords.escape() seems to break something
     describe command("grep '^Max open files' /proc/`cat /var/run/puppetlabs/puppetserver/puppetserver.pid`/limits"), :sudo => true do
       its(:exit_status) { is_expected.to eq 0 }

spec/acceptance/puppetserver_latest_spec.rb

@@ -13,20 +13,13 @@
     raise 'At least 2048MB free memory required' if memoryfree_mb < 256
   end
 
-  let(:pp) do
-    <<-EOS
-    class { '::puppet':
-      server                => true,
-      server_foreman        => false,
-      server_reports        => 'store',
-      server_external_nodes => '',
-      # only for install test - don't think to use this in production!
-      # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
-      server_jvm_max_heap_size => '256m',
-      server_jvm_min_heap_size => '256m',
-    }
-    EOS
+  it_behaves_like 'an idempotent resource' do
+    let(:manifest) do
+      <<-EOS
+      class { 'puppet':
+        server => true,
+      }
+      EOS
+    end
   end
-
-  it_behaves_like 'a idempotent resource'
 end

spec/acceptance/puppetserver_upgrade_5_3_6_to_5_3_7_spec.rb

@@ -23,24 +23,17 @@
   end
 
   context 'install 5.3.6' do
-    let(:pp) do
-      <<-EOS
-      class { '::puppet':
-        server                => true,
-        server_foreman        => false,
-        server_reports        => 'store',
-        server_external_nodes => '',
-        server_version        => '#{from_version}',
-        # only for install test - don't think to use this in production!
-        # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
-        server_jvm_max_heap_size => '256m',
-        server_jvm_min_heap_size => '256m',
-      }
-      EOS
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-EOS
+        class { 'puppet':
+          server         => true,
+          server_version => '#{from_version}',
+        }
+        EOS
+      end
     end
 
-    it_behaves_like 'a idempotent resource'
-
     describe command('puppetserver --version') do
       its(:stdout) { is_expected.to match("puppetserver version: 5.3.6\n") }
     end
@@ -56,24 +49,17 @@ class { '::puppet':
   end
 
   context 'upgrade to 5.3.7' do
-    let(:pp) do
-      <<-EOS
-      class { '::puppet':
-        server                => true,
-        server_foreman        => false,
-        server_reports        => 'store',
-        server_external_nodes => '',
-        server_version        => '#{to_version}',
-        # only for install test - don't think to use this in production!
-        # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
-        server_jvm_max_heap_size => '256m',
-        server_jvm_min_heap_size => '256m',
-      }
-      EOS
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-EOS
+        class { 'puppet':
+          server         => true,
+          server_version => '#{to_version}',
+        }
+        EOS
+      end
     end
 
-    it_behaves_like 'a idempotent resource'
-
     describe command('puppetserver --version') do
       its(:stdout) { is_expected.to match("puppetserver version: 5.3.7\n") }
     end

spec/acceptance/puppetserver_upgrade_6_7_0_to_6_7_2_spec.rb

@@ -23,24 +23,17 @@
   end
 
   context 'install 6.7.0' do
-    let(:pp) do
-      <<-EOS
-      class { '::puppet':
-        server                => true,
-        server_foreman        => false,
-        server_reports        => 'store',
-        server_external_nodes => '',
-        server_version        => '#{from_version}',
-        # only for install test - don't think to use this in production!
-        # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
-        server_jvm_max_heap_size => '256m',
-        server_jvm_min_heap_size => '256m',
-      }
-      EOS
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-EOS
+        class { 'puppet':
+          server         => true,
+          server_version => '#{from_version}',
+        }
+        EOS
+      end
     end
 
-    it_behaves_like 'a idempotent resource'
-
     describe command('puppetserver --version') do
       its(:stdout) { is_expected.to match("puppetserver version: 6.7.0\n") }
     end
@@ -56,24 +49,17 @@ class { '::puppet':
   end
 
   context 'upgrade to 6.7.2' do
-    let(:pp) do
-      <<-EOS
-      class { '::puppet':
-        server                => true,
-        server_foreman        => false,
-        server_reports        => 'store',
-        server_external_nodes => '',
-        server_version        => '#{to_version}',
-        # only for install test - don't think to use this in production!
-        # https://docs.puppet.com/puppetserver/latest/tuning_guide.html
-        server_jvm_max_heap_size => '256m',
-        server_jvm_min_heap_size => '256m',
-      }
-      EOS
+    it_behaves_like 'an idempotent resource' do
+      let(:manifest) do
+        <<-EOS
+        class { 'puppet':
+          server         => true,
+          server_version => '#{to_version}',
+        }
+        EOS
+      end
     end
 
-    it_behaves_like 'a idempotent resource'
-
     describe command('puppetserver --version') do
       its(:stdout) { is_expected.to match("puppetserver version: 6.7.2\n") }
     end

spec/spec_helper_acceptance.rb

@@ -12,31 +12,6 @@
     # refresh check if cache needs refresh on next yum command
     on host, 'yum clean expire-cache'
   end
-
-  local_setup = File.join(__dir__, 'setup_acceptance_node.pp')
-  if File.exist?(local_setup)
-    puts "Configuring #{host} by applying #{local_setup}"
-    apply_manifest_on(host, File.read(local_setup), catch_failures: true)
-  end
-end
-
-shared_examples 'a idempotent resource' do
-  it 'applies with no errors' do
-    apply_manifest(pp, catch_failures: true)
-  end
-
-  it 'applies a second time without changes' do
-    apply_manifest(pp, catch_changes: true)
-  end
-end
-
-shared_examples 'the example' do |name|
-  let(:pp) do
-    path = File.join(File.dirname(__dir__), 'examples', name)
-    File.read(path)
-  end
-
-  include_examples 'a idempotent resource'
 end
 
 Dir["./spec/support/acceptance/**/*.rb"].sort.each { |f| require f }