summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2017-04-10 18:33:41 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2017-04-18 22:43:41 -0300
commit476037b05b1a773bbe163ad01bc2046e38bf5a1f (patch)
tree181e82da2c07666fde911bc24b8cda0b0e03dabe /spec
parent0fa00e8461bc70d20006de4e2e30d07eabda1e69 (diff)
downloadgitlab-ce-476037b05b1a773bbe163ad01bc2046e38bf5a1f.tar.gz
Configure Gitaly through settings file instead of ENV varsgitaly-testing-toml
Diffstat (limited to 'spec')
-rw-r--r--spec/support/test_env.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 60c2096a126..b974335a081 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -124,12 +124,13 @@ module TestEnv
raise "Can't clone gitaly"
end
- start_gitaly(gitaly_dir, socket_path)
+ start_gitaly(gitaly_dir)
end
- def start_gitaly(gitaly_dir, socket_path)
+ def start_gitaly(gitaly_dir)
gitaly_exec = File.join(gitaly_dir, 'gitaly')
- @gitaly_pid = spawn({ "GITALY_SOCKET_PATH" => socket_path }, gitaly_exec, [:out, :err] => '/dev/null')
+ gitaly_config = File.join(gitaly_dir, 'config.toml')
+ @gitaly_pid = spawn(gitaly_exec, gitaly_config, [:out, :err] => '/dev/null')
end
def stop_gitaly