summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/health_checks
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-05-22 19:36:49 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-05-22 19:44:54 +0200
commit1f10a3c224dffc674e5cb6f4a719bb8b12e629d8 (patch)
treef6ef1445c8475d77fec25790256261ecd2e19cab /spec/lib/gitlab/health_checks
parent6ced4d138e56a82fc460d6281ae445fb7b739636 (diff)
downloadgitlab-ce-1f10a3c224dffc674e5cb6f4a719bb8b12e629d8.tar.gz
Stop skipping tests if local dependencies are not found
Diffstat (limited to 'spec/lib/gitlab/health_checks')
-rw-r--r--spec/lib/gitlab/health_checks/fs_shards_check_spec.rb6
1 files changed, 1 insertions, 5 deletions
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 289c93ecde7..2a174547b31 100644
--- a/spec/lib/gitlab/health_checks/fs_shards_check_spec.rb
+++ b/spec/lib/gitlab/health_checks/fs_shards_check_spec.rb
@@ -109,9 +109,7 @@ describe Gitlab::HealthChecks::FsShardsCheck do
let(:timeout_seconds) { 1.to_s }
before do
- skip 'timeout or gtimeout not available' unless any_timeout_command_exists?
-
- allow(described_class).to receive(:with_timeout) { [timeout_command, timeout_seconds].concat(%w{ sleep 2 }) }
+ allow(described_class).to receive(:with_timeout) { [timeout_command, timeout_seconds, 'sleep', 2] }
FileUtils.chmod_R(0755, tmp_dir)
end
@@ -137,8 +135,6 @@ describe Gitlab::HealthChecks::FsShardsCheck do
context 'when popen always finds required binaries' do
let(:timeout_seconds) { 30.to_s }
before do
- skip 'timeout or gtimeout not available' unless any_timeout_command_exists?
-
allow(described_class).to receive(:exec_with_timeout).and_wrap_original do |method, *args, &block|
begin
method.call(*args, &block)