diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-26 13:23:27 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-26 13:23:27 +0200 |
| commit | 7ce0a61a993f36f30692f93c477f671f82dbef51 (patch) | |
| tree | f416f0b2e9d3c3f2b19c4970e6b5ba8f5a8fcfce | |
| parent | 895e1b3ed1de5f94414b0e042b0053fab794a1f6 (diff) | |
| download | gitlab-ce-7ce0a61a993f36f30692f93c477f671f82dbef51.tar.gz | |
use `.zero?` instead of `== 0`
| -rw-r--r-- | lib/gitlab/health_checks/fs_shards_check.rb | 8 | ||||
| -rw-r--r-- | spec/lib/gitlab/health_checks/fs_shards_check_spec.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab/health_checks/fs_shards_check.rb b/lib/gitlab/health_checks/fs_shards_check.rb index ddd1aaa7043..928fb014ef4 100644 --- a/lib/gitlab/health_checks/fs_shards_check.rb +++ b/lib/gitlab/health_checks/fs_shards_check.rb @@ -81,7 +81,7 @@ module Gitlab def delete_test_file(tmp_path) _, status = exec_with_timeout(%W{ rm -f #{tmp_path} }) - status == 0 + status.zero? rescue Errno::ENOENT File.delete(tmp_path) rescue Errno::ENOENT end @@ -90,7 +90,7 @@ module Gitlab stat_path = File.join(storage_path(storage_name), '.') begin _, status = exec_with_timeout(%W{ stat #{stat_path} }) - status == 0 + status.zero? rescue Errno::ENOENT File.exist?(stat_path) && File::Stat.new(stat_path).readable? end @@ -100,7 +100,7 @@ module Gitlab _, status = exec_with_timeout(%W{ tee #{tmp_path} }) do |stdin| stdin.write(RANDOM_STRING) end - status == 0 + status.zero? rescue Errno::ENOENT written_bytes = File.write(tmp_path, RANDOM_STRING) rescue Errno::ENOENT written_bytes == RANDOM_STRING.length @@ -110,7 +110,7 @@ module Gitlab _, status = exec_with_timeout(%W{ diff #{tmp_path} - }) do |stdin| stdin.write(RANDOM_STRING) end - status == 0 + status.zero? rescue Errno::ENOENT file_contents = File.read(tmp_path) rescue Errno::ENOENT file_contents == RANDOM_STRING diff --git a/spec/lib/gitlab/health_checks/fs_shards_check_spec.rb b/spec/lib/gitlab/health_checks/fs_shards_check_spec.rb index 0a8dfa3bbdd..8abc4320c59 100644 --- a/spec/lib/gitlab/health_checks/fs_shards_check_spec.rb +++ b/spec/lib/gitlab/health_checks/fs_shards_check_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Gitlab::HealthChecks::FsShardsCheck do def command_exists?(command) _, status = Gitlab::Popen.popen(%W{ #{command} 1 echo }) - status == 0 + status.zero? rescue Errno::ENOENT false end |