summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-14 08:04:28 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-14 08:04:28 +0000
commit6cf568f4b56dcafc5c0fe84df2c0d2491fb0c62b (patch)
treed38103e91a35989ac33514fe49d7875bd11d3e37
parentc81b224edca453ed8ea3030cc74b2ede5ac9e63a (diff)
* bootstraptest/runner.rb: use safe navigation operator.
[fix GH-1142] Patch by @mlarraz * test/openssl/test_pair.rb: ditto. * test/ruby/test_econv.rb: ditto. * test/ruby/test_settracefunc.rb: ditto. * test/thread/test_queue.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rwxr-xr-xbootstraptest/runner.rb2
-rw-r--r--test/openssl/test_pair.rb2
-rw-r--r--test/ruby/test_econv.rb4
-rw-r--r--test/ruby/test_settracefunc.rb2
-rw-r--r--test/thread/test_queue.rb2
6 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f86996..379caca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Dec 14 17:03:05 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * bootstraptest/runner.rb: use safe navigation operator.
+ [fix GH-1142] Patch by @mlarraz
+ * test/openssl/test_pair.rb: ditto.
+ * test/ruby/test_econv.rb: ditto.
+ * test/ruby/test_settracefunc.rb: ditto.
+ * test/thread/test_queue.rb: ditto.
+
Mon Dec 14 14:33:35 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* lib/xmlrpc.rb: added documentation for parser details.
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index d9711fe..5eb468a 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -347,7 +347,7 @@ def assert_normal_exit(testsrc, *rest)
$stderr.reopen(old_stderr)
old_stderr.close
end
- if status && status.signaled?
+ if status&.signaled?
signo = status.termsig
signame = Signal.list.invert[signo]
unless ignore_signals and ignore_signals.include?(signame)
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 9324265..33ec555 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -49,7 +49,7 @@ module OpenSSL::SSLPairM
return c, s
end
ensure
- if th && th.alive?
+ if th&.alive?
th.kill
th.join
end
diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb
index 073355f..5690ec7 100644
--- a/test/ruby/test_econv.rb
+++ b/test/ruby/test_econv.rb
@@ -18,8 +18,8 @@ class TestEncodingConverter < Test::Unit::TestCase
def assert_errinfo(e_res, e_enc1, e_enc2, e_error_bytes, e_readagain_bytes, ec)
assert_equal([e_res, e_enc1, e_enc2,
- e_error_bytes && e_error_bytes.b,
- e_readagain_bytes && e_readagain_bytes.b],
+ e_error_bytes&.b,
+ e_readagain_bytes&.b],
ec.primitive_errinfo)
end
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index ef5a0c0..e5048ad 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -464,7 +464,7 @@ class TestSetTraceFunc < Test::Unit::TestCase
EOF
self.class.class_eval{remove_const(:XYZZY)}
ensure
- trace.disable if trace && trace.enabled?
+ trace.disable if trace&.enabled?
end
answer_events = [
diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
index 59d51e7..7ab6d1e 100644
--- a/test/thread/test_queue.rb
+++ b/test/thread/test_queue.rb
@@ -427,7 +427,7 @@ class TestQueue < Test::Unit::TestCase
# wait for all threads to be finished, because of exceptions
# NOTE: thr.status will be nil (raised) or false (terminated)
- sleep 0.01 until prod_threads && prod_threads.all?{|thr| !thr.status}
+ sleep 0.01 until prod_threads&.all?{|thr| !thr.status}
# check that all threads failed to call push
prod_threads.each do |thr|