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
0a60b32b
Commit
0a60b32b
authored
Dec 23, 2019
by
Ash McKenzie
Committed by
Douglas Barbosa Alexandre
Jan 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Misc spec tidy up
parent
8e20e899
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
7 deletions
+4
-7
ee/lib/gitlab/geo/log_helpers.rb
ee/lib/gitlab/geo/log_helpers.rb
+0
-2
ee/spec/services/geo/container_repository_updated_event_store_spec.rb
...ices/geo/container_repository_updated_event_store_spec.rb
+4
-3
ee/spec/services/geo/job_artifact_deleted_event_store_spec.rb
...pec/services/geo/job_artifact_deleted_event_store_spec.rb
+0
-1
ee/spec/services/geo/lfs_object_deleted_event_store_spec.rb
ee/spec/services/geo/lfs_object_deleted_event_store_spec.rb
+0
-1
No files found.
ee/lib/gitlab/geo/log_helpers.rb
View file @
0a60b32b
...
@@ -40,11 +40,9 @@ module Gitlab
...
@@ -40,11 +40,9 @@ module Gitlab
def
get_sidekiq_job_id
def
get_sidekiq_job_id
context_data
=
Thread
.
current
[
:sidekiq_context
]
&
.
first
context_data
=
Thread
.
current
[
:sidekiq_context
]
&
.
first
return
unless
context_data
return
unless
context_data
index
=
context_data
.
index
(
'JID-'
)
index
=
context_data
.
index
(
'JID-'
)
return
unless
index
return
unless
index
context_data
[
index
+
4
..-
1
]
context_data
[
index
+
4
..-
1
]
...
...
ee/spec/services/geo/container_repository_updated_event_store_spec.rb
View file @
0a60b32b
...
@@ -29,9 +29,10 @@ describe Geo::ContainerRepositoryUpdatedEventStore do
...
@@ -29,9 +29,10 @@ describe Geo::ContainerRepositoryUpdatedEventStore do
subject
=
described_class
.
new
(
nil
)
subject
=
described_class
.
new
(
nil
)
expected_message
=
{
expected_message
=
{
class:
described_class
.
name
,
class:
described_class
.
name
,
message:
'Container repository updated event could not be created'
,
host:
'localhost'
,
error:
"Validation failed: Container repository can't be blank"
message:
'Container repository updated event could not be created'
,
error:
"Validation failed: Container repository can't be blank"
}
}
expect
(
Gitlab
::
Geo
::
Logger
).
to
receive
(
:error
).
with
(
expected_message
).
and_call_original
expect
(
Gitlab
::
Geo
::
Logger
).
to
receive
(
:error
).
with
(
expected_message
).
and_call_original
...
...
ee/spec/services/geo/job_artifact_deleted_event_store_spec.rb
View file @
0a60b32b
...
@@ -39,7 +39,6 @@ describe Geo::JobArtifactDeletedEventStore do
...
@@ -39,7 +39,6 @@ describe Geo::JobArtifactDeletedEventStore do
class:
"Geo::JobArtifactDeletedEventStore"
,
class:
"Geo::JobArtifactDeletedEventStore"
,
host:
"localhost"
,
host:
"localhost"
,
job_artifact_id:
invalid_job_artifact
.
id
,
job_artifact_id:
invalid_job_artifact
.
id
,
file_path:
nil
,
project_id:
project
.
id
,
project_id:
project
.
id
,
project_path:
project
.
full_path
,
project_path:
project
.
full_path
,
storage_version:
project
.
storage_version
,
storage_version:
project
.
storage_version
,
...
...
ee/spec/services/geo/lfs_object_deleted_event_store_spec.rb
View file @
0a60b32b
...
@@ -39,7 +39,6 @@ describe Geo::LfsObjectDeletedEventStore do
...
@@ -39,7 +39,6 @@ describe Geo::LfsObjectDeletedEventStore do
class:
"Geo::LfsObjectDeletedEventStore"
,
class:
"Geo::LfsObjectDeletedEventStore"
,
host:
"localhost"
,
host:
"localhost"
,
lfs_object_id:
invalid_lfs_object
.
id
,
lfs_object_id:
invalid_lfs_object
.
id
,
file_path:
nil
,
message:
"Lfs object deleted event could not be created"
,
message:
"Lfs object deleted event could not be created"
,
error:
"Validation failed: File path can't be blank"
error:
"Validation failed: File path can't be blank"
}
}
...
...
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