aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-07-28 11:49:26 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-07-28 11:49:26 +0900
commit1c244fa916f274b715594492a85fcfa57c987c2e (patch)
treee6a6d7c90064edc0edf55944a8443cf01d2e8ce0
parenta45704f808846cc7e95a624e8b595e4c20a48810 (diff)
parentcbbb850a2a1a10e8636836a6ba4ad018a7653931 (diff)
downloadruby-openssl-1c244fa916f274b715594492a85fcfa57c987c2e.tar.gz
Merge changes from Ruby trunk r55538..r55757
* ruby-trunk r55538..r55757: (1 commits) (r55757) test: use assert_include Sync-with-trunk: r55757
-rw-r--r--test/test_pair.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_pair.rb b/test/test_pair.rb
index cf9b9303..ee43a0c6 100644
--- a/test/test_pair.rb
+++ b/test/test_pair.rb
@@ -497,13 +497,13 @@ module OpenSSL::TestPairM
until th.join(0.01)
accepted = s2.accept_nonblock(exception: false)
- assert_includes([s2, :wait_readable, :wait_writable ], accepted)
+ assert_include([s2, :wait_readable, :wait_writable ], accepted)
end
rets = th.value
assert_instance_of Array, rets
rets.each do |rv|
- assert_includes([s1, :wait_readable, :wait_writable ], rv)
+ assert_include([s1, :wait_readable, :wait_writable ], rv)
end
ensure
th.join if th