diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-21 03:38:52 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-21 03:38:52 +0000 |
| commit | bf26f847faa4e068ffa117abc6fa0271e2c1c83b (patch) | |
| tree | 617b0971e7de9914d72cc5050dbe3ca55ef54200 | |
| parent | 543acfabdc10420c1076dafb01c2a125e5fa7174 (diff) | |
Exclude CI platform specific failures by --excludes option
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | test/excludes/_travis/IMAPTest.rb | 3 | ||||
| -rw-r--r-- | test/excludes/_travis/TestGemRemoteFetcher.rb | 4 | ||||
| -rw-r--r-- | test/net/imap/test_imap.rb | 5 | ||||
| -rw-r--r-- | test/rubygems/test_gem_remote_fetcher.rb | 5 |
5 files changed, 8 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index eaabafd6e1..9d0ae868cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ matrix: - "CONFIG_FLAG='--with-opt-dir=/usr/local/opt/openssl@1.1:/usr/local/opt/zlib'" # osx build randomly fails with -j - "JOBS=" - - "TEST_ALL_TESTOPTS=\"--color=never --job-status=replace\"" + - "TEST_ALL_TESTOPTS=\"--color=never --job-status=replace\" --excludes=$(TESTSDIR)/excludes/_travis" before_install: # Bare "brew update" nukes everything. # These steps are very carefully chosen to avoid breaking things. diff --git a/test/excludes/_travis/IMAPTest.rb b/test/excludes/_travis/IMAPTest.rb new file mode 100644 index 0000000000..11687702a1 --- /dev/null +++ b/test/excludes/_travis/IMAPTest.rb @@ -0,0 +1,3 @@ +# https://travis-ci.org/ruby/ruby/jobs/444232675 +# randomly raises: Errno::EPROTOTYPE "Protocol wrong type for socket" +exclude(:test_imaps_post_connection_check, 'This test randomly fails with OpenSSL 1.1.1 on Travis osx build') diff --git a/test/excludes/_travis/TestGemRemoteFetcher.rb b/test/excludes/_travis/TestGemRemoteFetcher.rb new file mode 100644 index 0000000000..e10c0ff45c --- /dev/null +++ b/test/excludes/_travis/TestGemRemoteFetcher.rb @@ -0,0 +1,4 @@ +# https://travis-ci.org/ruby/ruby/jobs/444240249 +# raises: OpenSSL::SSL::SSLError "SSL_read: tlsv1 alert decrypt error" +exclude(:test_do_not_allow_invalid_client_cert_auth_connection, + 'This test is failing with OpenSSL 1.1.1 on Travis osx build') diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb index 46a1260412..936f4e0f42 100644 --- a/test/net/imap/test_imap.rb +++ b/test/net/imap/test_imap.rb @@ -100,11 +100,6 @@ class IMAPTest < Test::Unit::TestCase end def test_imaps_post_connection_check - if ENV.key?('TRAVIS') && /darwin/ =~ RUBY_PLATFORM - # https://travis-ci.org/ruby/ruby/jobs/444232675 - # randomly raises: Errno::EPROTOTYPE "Protocol wrong type for socket" - skip 'This test randomly fails with OpenSSL 1.1.1 on Travis osx build' - end assert_raise(OpenSSL::SSL::SSLError) do imaps_test do |port| # server_addr is different from the hostname in the certificate, diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb index 4d1fe6587c..dfef55c7ca 100644 --- a/test/rubygems/test_gem_remote_fetcher.rb +++ b/test/rubygems/test_gem_remote_fetcher.rb @@ -883,11 +883,6 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg== def test_do_not_allow_invalid_client_cert_auth_connection skip 'openssl is missing' unless defined?(OpenSSL::SSL) - if ENV.key?('TRAVIS') && /darwin/ =~ RUBY_PLATFORM - # https://travis-ci.org/ruby/ruby/jobs/444240249 - # raises: OpenSSL::SSL::SSLError "SSL_read: tlsv1 alert decrypt error" - skip 'This test is failing with OpenSSL 1.1.1 on Travis osx build' - end ssl_server = self.class.start_ssl_server({ :SSLVerifyClient => |