Skip to content
Snippets Groups Projects
Commit 883749a6 authored by Robert Marshall's avatar Robert Marshall
Browse files

Fix up gitaly spec


- fix gitaly spec to match logic

Signed-off-by: default avatarRobert Marshall <rmarshall@gitlab.com>
parent 018ee5d4
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -488,7 +488,7 @@ RSpec.describe 'gitaly' do
end
 
context 'with a non-default workhorse unix socket' do
context 'without a socket directory set' do
context 'with only a listen address set' do
before do
stub_gitlab_rb(gitlab_workhorse: { listen_addr: '/fake/workhorse/socket' })
end
Loading
Loading
@@ -499,7 +499,7 @@ RSpec.describe 'gitaly' do
end
end
 
context 'with a socket directory set' do
context 'with only a socket directory set' do
before do
stub_gitlab_rb(gitlab_workhorse: { sockets_directory: '/fake/workhorse/sockets' })
end
Loading
Loading
@@ -509,6 +509,17 @@ RSpec.describe 'gitaly' do
.with_content(%r{\[gitlab\]\s+url = 'http\+unix://%2Ffake%2Fworkhorse%2Fsockets%2Fsocket'\s+relative_url_root = ''})
end
end
context 'with a listen_address and a sockets_directory set' do
before do
stub_gitlab_rb(gitlab_workhorse: { listen_addr: '/sockets/in/the/wind', sockets_directory: '/sockets/in/the' })
end
it 'create config file with provided values' do
expect(chef_run).to render_file(config_path)
.with_content(%r{\[gitlab\]\s+url = 'http\+unix://%2Fsockets%2Fin%2Fthe%2Fwind'\s+relative_url_root = ''})
end
end
end
 
context 'with a tcp workhorse listener' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment