Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d4bb36e9
Commit
d4bb36e9
authored
Oct 13, 2017
by
Andrew Newdigate
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Linter fixes
parent
78f933d7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
spec/lib/gitlab/git/popen_spec.rb
spec/lib/gitlab/git/popen_spec.rb
+2
-3
No files found.
spec/lib/gitlab/git/popen_spec.rb
View file @
d4bb36e9
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment