diff options
author | Andrew Newdigate <andrew@gitlab.com> | 2017-10-13 19:04:01 +0100 |
---|---|---|
committer | Andrew Newdigate <andrew@gitlab.com> | 2017-10-13 19:04:01 +0100 |
commit | f09a7b3c5403d75e0fc71320b58d02e06420926d (patch) | |
tree | f595cf1bf64d2d949cd45a82d8fa9f0a836ef991 | |
parent | b88e8aae83ac73ff6e72eb994169083d2c4dd412 (diff) | |
download | gitlab-ce-an/popen-deadline.tar.gz |
Linter fixesan/popen-deadline
-rw-r--r-- | spec/lib/gitlab/git/popen_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/lib/gitlab/git/popen_spec.rb b/spec/lib/gitlab/git/popen_spec.rb index 3dd5c698d62..2b65bc1cf15 100644 --- a/spec/lib/gitlab/git/popen_spec.rb +++ b/spec/lib/gitlab/git/popen_spec.rb @@ -98,7 +98,7 @@ describe 'Gitlab::Git::Popen' do context 'timeout period' do let(:time_taken) do begin - start = Time.now; + start = Time.now klass.new.popen_with_timeout(%w(sleep 1000), timeout, path) rescue Time.now - start @@ -108,7 +108,6 @@ describe 'Gitlab::Git::Popen' do it { expect(time_taken).to be >= timeout } end - context 'clean up' do let(:instance) { klass.new } @@ -120,7 +119,7 @@ describe 'Gitlab::Git::Popen' do pid = args.first begin Process.getpgid(pid) - fail "The child process should have been killed" + raise "The child process should have been killed" rescue Errno::ESRCH end end |