Enable gitaly token auth when testing
This commit is contained in:
parent
4f8af50b61
commit
218da88e1a
3 changed files with 5 additions and 2 deletions
|
@ -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:
|
||||||
|
|
|
@ -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{\Aunix:}, ''), storage: storages }
|
||||||
TOML.dump(socket_path: address.sub(%r{\Aunix:}, ''), storage: storages)
|
config[:auth] = { token: 'secret' } if Rails.env.test?
|
||||||
|
TOML.dump(config)
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_gitaly_configuration
|
def create_gitaly_configuration
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue