From 8b0500f312458c7be564755e144a3437143fb8ed Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Mon, 7 Jun 2021 17:06:11 +0200
Subject: [PATCH] Disable additional tests failing with OpenSSL 3.0.

Related: rhbz#1952925
---
 ruby.spec | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/ruby.spec b/ruby.spec
index 9a62be8..e5205d8 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -22,7 +22,7 @@
 %endif
 
 
-%global release 148
+%global release 149
 %{!?release_string:%define release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
 # The RubyGems library has to stay out of Ruby directory tree, since the
@@ -893,6 +893,49 @@ sed -i "/^\s*def test_connect$/ a \
   skip 'Fails to load cert with o penssl 3.0.'" tool/test/webrick/test_httpproxy.rb
 mv test/net/http/test_https.rb{,.disable}
 mv test/openssl/utils.rb{,.disable}
+
+# Disable certificates, because they fail to load. Same as without OpenSSL.
+for vname in \
+  PUBLIC_CERT \
+  PRIVATE_KEY \
+  ENCRYPTED_PRIVATE_KEY \
+  PUBLIC_KEY \
+;do
+  sed -i "s/^\(\s*${vname}\s*=\s*\).*$/\1nil/" \
+    lib/rubygems/test_case.rb
+done
+# Missing openssl certificate methods (e.g. '.to_pem'),
+# or certificates completely. Caused by disabling certificates above.
+mv test/rubygems/test_gem_security_trust_dir.rb{,.disable}
+mv test/rubygems/test_gem_security_signer.rb{,.disable}
+mv test/rubygems/test_gem_security_policy.rb{,.disable}
+mv test/rubygems/test_gem_commands_cert_command.rb{,.disable}
+mv test/rubygems/test_gem_security.rb{,.disable}
+for tname in \
+  build_auto_signed \
+  build_auto_signed_encrypted_key \
+  build_signed \
+  build_signed_encrypted_key \
+  verify_security_policy_checksum_missing \
+  verify_security_policy_low_security \
+;do
+  sed -i "/^\s*def test_${tname}$/ a \
+    skip 'Missing certificate methods.'" test/rubygems/test_gem_package.rb
+done
+sed -i "/^\s*def test_add_file_signer$/ a \
+  skip 'Missing certificate method \".length\".'" \
+    test/rubygems/test_gem_package_tar_writer.rb
+sed -i "/^\s*def test_do_not_allow_invalid_client_cert_auth_connection$/ a \
+  skip 'Missing a certificate.'" \
+    test/rubygems/test_gem_remote_fetcher.rb
+sed -i "/^\s*def test_ssl_client_cert_auth_connection$/ a \
+  skip 'Missing a certificate.'" \
+    test/rubygems/test_gem_remote_fetcher.rb
+
+# Different output for Invalid CA certificate error.
+sed -i "/^\s*def test_verify_certificate_extra_message$/ a \
+  skip 'Different error output with OpenSSL 3.0.'" \
+    test/rubygems/test_gem_request.rb
 %endif
 
 DISABLE_TESTS=""
@@ -1379,7 +1422,7 @@ MSPECOPTS=""
 
 
 %changelog
-* Thu Jun 03 2021 Pavel Valena <pvalena@redhat.com> - 3.0.1-148
+* Thu Jun 03 2021 Pavel Valena <pvalena@redhat.com> - 3.0.1-149
 - Support OpenSSL 3.0.
   Resolves: rhbz#1952925