Merge branch 'gitaly-testing-toml' into 'master'

Gitaly testing toml

Closes gitaly#182

See merge request !10605

1 files changed, 4 insertions, 3 deletions

diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index eb0f1efe55b..5c8ee8d62f5 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -125,12 +125,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