Skip the ssl tests on Brew s390x build environment.

Fix FTBFS due to SSL tests on s390x. The s390x builders in Brew have
unexpected configuration of DNS, which make the tests fail.

Related: rhbz#1938942
This commit is contained in:
Jarek Prokop 2021-06-22 19:46:03 +02:00
parent d92f6f9d59
commit 9599325b90
2 changed files with 24 additions and 0 deletions

View File

@ -0,0 +1,16 @@
diff --git a/test/rubygems/test_bundled_ca.rb b/test/rubygems/test_bundled_ca.rb
index 6973758c4c..71f61ca8f7 100644
--- a/test/rubygems/test_bundled_ca.rb
+++ b/test/rubygems/test_bundled_ca.rb
@@ -32,7 +32,7 @@ def assert_https(host)
http.verify_mode = OpenSSL::SSL::VERIFY_PEER
http.cert_store = bundled_certificate_store
http.get('/')
- rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError
+ rescue Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::ENOENT, Errno::ETIMEDOUT, SocketError
skip "#{host} seems offline, I can't tell whether ssl would work."
rescue OpenSSL::SSL::SSLError => e
# Only fail for certificate verification errors
--
2.29.2

View File

@ -153,6 +153,10 @@ Patch15: ruby-dwarf5-avoid_crash-r1.patch
# Avoid possible timeout errors in TestBugReporter#test_bug_reporter_add.
# https://bugs.ruby-lang.org/issues/16492
Patch19: ruby-2.7.1-Timeout-the-test_bug_reporter_add-witout-raising-err.patch
# Skip the ssl tests on Brew s390x build environment.
# https://projects.engineering.redhat.com/browse/RHELBLD-6305
# https://github.com/ruby/ruby/pull/4112
Patch100: ruby-3.0.0-Skip-ssl-tests-for-offline.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Suggests: rubypick
@ -589,6 +593,9 @@ rm -rf ext/fiddle/libffi*
%patch9 -p1
%patch15 -p1
%patch19 -p1
%ifarch s390x
%patch100 -p1
%endif
# Provide an example of usage of the tapset:
cp -a %{SOURCE3} .
@ -1360,6 +1367,7 @@ MSPECOPTS=""
* Drop Net::Telnet and XMLRPC packages, because they were dropped from Ruby.
Resolves: rhbz#1938942
- Fix FTBFS due to an incompatible load directive.
- Skip the SSL tests on Brew s390x build environment.
* Wed Apr 07 2021 Pavel Valena <pvalena@redhat.com> - 2.7.3-136
- Upgrade to Ruby 2.7.3.