Stop skipping tests if local dependencies are not found
This commit is contained in:
parent
6ced4d138e
commit
1f10a3c224
2 changed files with 1 additions and 9 deletions
|
@ -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)
|
||||
|
|
|
@ -6,10 +6,6 @@ module TimeoutHelper
|
|||
false
|
||||
end
|
||||
|
||||
def any_timeout_command_exists?
|
||||
command_exists?('timeout') || command_exists?('gtimeout')
|
||||
end
|
||||
|
||||
def timeout_command
|
||||
@timeout_command ||=
|
||||
if command_exists?('timeout')
|
||||
|
|
Loading…
Reference in a new issue