Merge branch 'ky/fix-ssl-test-internal-encoding'

* ky/fix-ssl-test-internal-encoding:
  Fix test-all tests to avoid creating report_on_exception warnings

1 files changed, 6 insertions, 4 deletions

diff --git a/test/test_ssl.rb b/test/test_ssl.rb
index 1f7f6a39..3b063d2e 100644
--- a/test/test_ssl.rb
+++ b/test/test_ssl.rb
@@ -1340,13 +1340,15 @@ end
       ctx2.enable_fallback_scsv
       ctx2.max_version = OpenSSL::SSL::TLS1_1_VERSION
       s2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2)
-      t = Thread.new { s2.connect }
-      assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) {
-        s1.accept
+      t = Thread.new {
+        assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) {
+          s2.connect
+        }
       }
       assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) {
-        t.join
+        s1.accept
       }
+      t.join
     ensure
       sock1.close
       sock2.close