summaryrefslogtreecommitdiff
path: root/test/openssl
diff options
context:
space:
mode:
Diffstat (limited to 'test/openssl')
-rw-r--r--test/openssl/test_pair.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 5bf74e596d..588098c668 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -301,6 +301,7 @@ module OpenSSL::TestPairM
assert_equal s1, t.value
assert accept
ensure
+ t.join
s1.close if s1
s2.close if s2
sock1.close if sock1
@@ -324,6 +325,7 @@ module OpenSSL::TestPairM
assert_equal s1, t.value
assert accept
ensure
+ t.join
s1.close if s1
s2.close if s2
sock1.close if sock1
@@ -363,12 +365,12 @@ module OpenSSL::TestPairM
assert called, 'ecdh callback should be called'
ensure
+ th.join
s1.close if s1
s2.close if s2
sock1.close if sock1
sock2.close if sock2
accepted.close if accepted.respond_to?(:close)
- th.join rescue nil
end
def test_connect_accept_nonblock_no_exception
@@ -411,6 +413,7 @@ module OpenSSL::TestPairM
assert_includes([s1, :wait_readable, :wait_writable ], rv)
end
ensure
+ th.join
s1.close if s1
s2.close if s2
sock1.close if sock1