Skip to content

Commit 3d23916

Browse files
committed
(maint) Updates OpenSSL errors in spec
Between OpenSSL 1.1 and 3, error messages about self-signed certificates changed from using "self signed" (no hyphen) to "self-signed" (with a hyphen). This change caused regex for these errors in our spec tests to fail. This commit relaxes the regex in our spec tests so that it matches both OpenSSL 1.1 and 3 error messages.
1 parent 178ff2e commit 3d23916

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

spec/integration/application/apply_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ def bogus()
629629
apply.run
630630
}.to exit_with(0)
631631
.and output(/Applied catalog/).to_stdout
632-
.and output(/Report processor failed: certificate verify failed \[self signed certificate in certificate chain for CN=Unknown CA\]/).to_stderr
632+
.and output(/Report processor failed: certificate verify failed \[self.signed certificate in certificate chain for CN=Unknown CA\]/).to_stderr
633633
end
634634
end
635635

spec/integration/http/client_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
expect {
5454
client.get(URI("https://127.0.0.1:#{port}"), options: {ssl_context: alt_context})
5555
}.to raise_error(Puppet::SSL::CertVerifyError,
56-
%r{certificate verify failed.* .self signed certificate in certificate chain for CN=Test CA.})
56+
%r{certificate verify failed.* .self.signed certificate in certificate chain for CN=Test CA.})
5757
end
5858
end
5959

@@ -170,7 +170,7 @@
170170
expect {
171171
client.get(URI("https://127.0.0.1:#{port}"), options: {ssl_context: system_context})
172172
}.to raise_error(Puppet::SSL::CertVerifyError,
173-
%r{certificate verify failed.* .self signed certificate in certificate chain for CN=Test CA.})
173+
%r{certificate verify failed.* .self.signed certificate in certificate chain for CN=Test CA.})
174174
end
175175
end
176176
end

spec/integration/network/http_pool_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def connection(host, port)
7777
expect {
7878
http.get('/')
7979
}.to raise_error(Puppet::Error,
80-
%r{certificate verify failed.* .self signed certificate in certificate chain for CN=Test CA.})
80+
%r{certificate verify failed.* .self.signed certificate in certificate chain for CN=Test CA.})
8181
end
8282
end
8383

@@ -219,7 +219,7 @@ def require_client_certs(ctx)
219219
expect {
220220
http.get('/')
221221
}.to raise_error(Puppet::Error,
222-
%r{certificate verify failed.* .self signed certificate in certificate chain for CN=Test CA.})
222+
%r{certificate verify failed.* .self.signed certificate in certificate chain for CN=Test CA.})
223223
end
224224
end
225225

0 commit comments

Comments
 (0)