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
Boxiang Sun
gitlab-ce
Commits
218da88e
Commit
218da88e
authored
Jun 20, 2017
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable gitaly token auth when testing
parent
4f8af50b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
config/gitlab.yml.example
config/gitlab.yml.example
+1
-0
lib/tasks/gitlab/gitaly.rake
lib/tasks/gitlab/gitaly.rake
+3
-2
spec/tasks/gitlab/gitaly_rake_spec.rb
spec/tasks/gitlab/gitaly_rake_spec.rb
+1
-0
No files found.
config/gitlab.yml.example
View file @
218da88e
...
@@ -599,6 +599,7 @@ test:
...
@@ -599,6 +599,7 @@ test:
gitaly_address: unix:tmp/tests/gitaly/gitaly.socket
gitaly_address: unix:tmp/tests/gitaly/gitaly.socket
gitaly:
gitaly:
enabled: true
enabled: true
token: secret
backup:
backup:
path: tmp/tests/backups
path: tmp/tests/backups
gitlab_shell:
gitlab_shell:
...
...
lib/tasks/gitlab/gitaly.rake
View file @
218da88e
...
@@ -58,8 +58,9 @@ namespace :gitlab do
...
@@ -58,8 +58,9 @@ namespace :gitlab do
storages
<<
{
name:
key
,
path:
val
[
'path'
]
}
storages
<<
{
name:
key
,
path:
val
[
'path'
]
}
end
end
config
=
{
socket_path:
address
.
sub
(
%r{
\A
unix:}
,
''
),
storage:
storages
}
TOML
.
dump
(
socket_path:
address
.
sub
(
%r{
\A
unix:}
,
''
),
storage:
storages
)
config
[
:auth
]
=
{
token:
'secret'
}
if
Rails
.
env
.
test?
TOML
.
dump
(
config
)
end
end
def
create_gitaly_configuration
def
create_gitaly_configuration
...
...
spec/tasks/gitlab/gitaly_rake_spec.rb
View file @
218da88e
...
@@ -89,6 +89,7 @@ describe 'gitlab:gitaly namespace rake task' do
...
@@ -89,6 +89,7 @@ describe 'gitlab:gitaly namespace rake task' do
}
}
}
}
allow
(
Gitlab
.
config
.
repositories
).
to
receive
(
:storages
).
and_return
(
config
)
allow
(
Gitlab
.
config
.
repositories
).
to
receive
(
:storages
).
and_return
(
config
)
allow
(
Rails
.
env
).
to
receive
(
:test?
).
and_return
(
false
)
expected_output
=
''
expected_output
=
''
Timecop
.
freeze
do
Timecop
.
freeze
do
...
...
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