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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
cae17352
Commit
cae17352
authored
Jun 04, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos and add a small spec
parent
f9b821f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
spec/models/ci/build_spec.rb
spec/models/ci/build_spec.rb
+1
-1
spec/support/shared_examples/ci_trace_shared_examples.rb
spec/support/shared_examples/ci_trace_shared_examples.rb
+4
-2
No files found.
spec/models/ci/build_spec.rb
View file @
cae17352
...
@@ -130,7 +130,7 @@ describe Ci::Build do
...
@@ -130,7 +130,7 @@ describe Ci::Build do
context
'when build does not have live trace'
do
context
'when build does not have live trace'
do
let!
(
:build
)
{
create
(
:ci_build
,
:success
,
:trace_artifact
)
}
let!
(
:build
)
{
create
(
:ci_build
,
:success
,
:trace_artifact
)
}
it
'
selects
the build'
do
it
'
does not select
the build'
do
is_expected
.
to
be_empty
is_expected
.
to
be_empty
end
end
end
end
...
...
spec/support/shared_examples/ci_trace_shared_examples.rb
View file @
cae17352
...
@@ -246,12 +246,14 @@ shared_examples_for 'common trace features' do
...
@@ -246,12 +246,14 @@ shared_examples_for 'common trace features' do
expect
(
build
.
job_artifacts_trace
).
to
be_exist
expect
(
build
.
job_artifacts_trace
).
to
be_exist
end
end
context
'when anothe
process had
already been archiving'
,
:clean_gitlab_redis_shared_state
do
context
'when anothe
r process has
already been archiving'
,
:clean_gitlab_redis_shared_state
do
before
do
before
do
Gitlab
::
ExclusiveLease
.
new
(
"trace:archive:
#{
trace
.
job
.
id
}
"
,
timeout:
1
.
hour
).
try_obtain
Gitlab
::
ExclusiveLease
.
new
(
"trace:archive:
#{
trace
.
job
.
id
}
"
,
timeout:
1
.
hour
).
try_obtain
end
end
it
'prevents to archive concurently'
do
it
'blocks concurrent archiving'
do
expect
(
Rails
.
logger
).
to
receive
(
:error
).
with
(
'Cannot obtain an exclusive lease. There must be another instance already in execution.'
)
subject
subject
build
.
reload
build
.
reload
...
...
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