Merge pull request #559 from puppetlabs/CONT-1181-fix-build-failure

(CONT-1181) - Fixing build failure for RedHat
puppetlabs · Jul 20, 2023 · 42f0173 · 42f0173
2 parents b16ec2c + 70fddea
commit 42f0173
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-03-29 09:56:35 UTC using RuboCop version 1.48.1.
+# on 2023-07-20 04:54:59 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -41,8 +41,8 @@ RSpec/NamedSubject:
     - 'spec/classes/haproxy_spec.rb'
     - 'spec/defines/instance_service_spec.rb'
     - 'spec/defines/instance_spec.rb'
-  
-# Offense count: 183
+
+# Offense count: 181
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:

diff --git a/spec/acceptance/listen_spec.rb b/spec/acceptance/listen_spec.rb
@@ -50,7 +50,6 @@ class { 'haproxy': }
           listening_service => 'app00',
           server_names      => 'test00.example.com',
           ports             => '5556',
-          options           => 'check',
         }
         haproxy::balancermember { 'port 5557':
           listening_service => 'app00',

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
@@ -3,7 +3,7 @@
 UNSUPPORTED_PLATFORMS = ['Suse', 'windows', 'AIX', 'Solaris'].freeze
 MAX_RETRY_COUNT       = 12
 RETRY_WAIT            = 10
-ERROR_MATCHER         = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed)}.freeze
+ERROR_MATCHER         = %r{(no valid OpenPGP data found|keyserver timed out|keyserver receive failed|Connection reset by peer|closed stream)}.freeze
 
 require 'singleton'