Move class test to run first for Debian 9

puppetlabs · Jun 18, 2018 · 61daea2 · 61daea2
1 parent fab2381
commit 61daea2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/spec/acceptance/class_spec.rb → spec/acceptance/apt_class_spec.rb b/spec/acceptance/class_spec.rb → spec/acceptance/apt_class_spec.rb
diff --git a/spec/acceptance/apt_key_provider_spec.rb b/spec/acceptance/apt_key_provider_spec.rb
@@ -596,7 +596,7 @@ def apply_manifest_twice(manifest_pp)
   end
 
   describe 'ensure =>' do
-    context 'when absent' do
+    context 'when absent', unless: (fact('operatingsystem') == 'Debian' && fact('operatingsystemmajrelease') == '8') do
       it 'is removed' do
         # Install the key first (retry because key pool may timeout)
         install_key(CENTOS_GPG_KEY_FINGERPRINT)
@@ -682,7 +682,7 @@ def apply_manifest_twice(manifest_pp)
     context 'with nonexistant.key.server' do
       it 'fails' do
         apply_manifest(nonexistant_key_server_pp, expect_failures: true) do |r|
-          expect(r.stderr).to match(%r{(Host not found|Couldn't resolve host)})
+          expect(r.stderr).to match(%r{(Host not found|Couldn't resolve host|No name)})
         end
       end
     end

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -80,6 +80,11 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
 RSpec.configure do |c|
   File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
+  # dirmngr needs installed on Debian 9 machines to allow the tests to run
+  if fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '9'
+    shell('yes | sudo apt-get update && yes | sudo apt-get install dirmngr')
+  end
+
   # Readable test descriptions
   c.formatter = :documentation