Skip to content

Commit 538aec7

Browse files
committed
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
2 parents 308c158 + d5014e3 commit 538aec7

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

test/test_ssl.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,13 +1340,15 @@ def test_fallback_scsv
13401340
ctx2.enable_fallback_scsv
13411341
ctx2.max_version = OpenSSL::SSL::TLS1_1_VERSION
13421342
s2 = OpenSSL::SSL::SSLSocket.new(sock2, ctx2)
1343-
t = Thread.new { s2.connect }
1344-
assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) {
1345-
s1.accept
1343+
t = Thread.new {
1344+
assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) {
1345+
s2.connect
1346+
}
13461347
}
13471348
assert_raise_with_message(OpenSSL::SSL::SSLError, /inappropriate fallback/) {
1348-
t.join
1349+
s1.accept
13491350
}
1351+
t.join
13501352
ensure
13511353
sock1.close
13521354
sock2.close

0 commit comments

Comments
 (0)