Commit dc6e7380 authored by Stan Hu's avatar Stan Hu

Revert "Merge branch 'sh-use-absolute-paths-gitaly-tests' into 'master'"

This reverts merge request !53174
parent 97c2def3
...@@ -121,7 +121,7 @@ module Gitlab ...@@ -121,7 +121,7 @@ module Gitlab
config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby
config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path } config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
config[:bin_dir] = File.expand_path(Gitlab.config.gitaly.client_path) config[:bin_dir] = Gitlab.config.gitaly.client_path
config[:gitlab] = { url: Gitlab.config.gitlab.url } config[:gitlab] = { url: Gitlab.config.gitlab.url }
config[:logging] = { dir: Rails.root.join('log').to_s } config[:logging] = { dir: Rails.root.join('log').to_s }
......
...@@ -184,7 +184,7 @@ module TestEnv ...@@ -184,7 +184,7 @@ module TestEnv
end end
def gitaly_dir def gitaly_dir
File.dirname(File.expand_path(gitaly_socket_path)) File.dirname(gitaly_socket_path)
end end
def start_gitaly(gitaly_dir) def start_gitaly(gitaly_dir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment