diff options
author | Nick Thomas <nick@gitlab.com> | 2019-03-13 13:42:43 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-03-13 13:42:43 +0000 |
commit | 9f05e97aad33a0cd70862f67101bdcb3fddc639a (patch) | |
tree | a9868d2c6711ebff1dcbb06f6d09f91d15caa631 /scripts | |
parent | 5ed9c5f7f74d7305bb884a6ae7a601d4563398a4 (diff) | |
download | gitlab-ce-9f05e97aad33a0cd70862f67101bdcb3fddc639a.tar.gz |
Run rubocop -a
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/gitaly_test.rb | 16 | ||||
-rwxr-xr-x | scripts/merge-simplecov | 8 |
2 files changed, 10 insertions, 14 deletions
diff --git a/scripts/gitaly_test.rb b/scripts/gitaly_test.rb index dee4c2eba7e..b5d3facd18a 100644 --- a/scripts/gitaly_test.rb +++ b/scripts/gitaly_test.rb @@ -79,15 +79,13 @@ module GitalyTest socket = read_socket_path Integer(timeout / delay).times do - begin - UNIXSocket.new(socket) - puts ' OK' - - return - rescue Errno::ENOENT, Errno::ECONNREFUSED - print '.' - sleep delay - end + UNIXSocket.new(socket) + puts ' OK' + + return + rescue Errno::ENOENT, Errno::ECONNREFUSED + print '.' + sleep delay end puts ' FAILED' diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov index 65f93f8830b..746be3317a7 100755 --- a/scripts/merge-simplecov +++ b/scripts/merge-simplecov @@ -12,11 +12,9 @@ module SimpleCov def resultset_hashes resultset_files.map do |path| - begin - JSON.parse(File.read(path)) - rescue - {} - end + JSON.parse(File.read(path)) + rescue + {} end end |