diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-15 14:19:56 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-15 14:19:56 +0000 |
| commit | db46475821c4546438797a5580a479ca73a862ba (patch) | |
| tree | 320c2de69c864c6c2fdbe8b9a645c14f869bd6c1 /spec/support | |
| parent | 53a9f6a0cb2a81b4a5c780fb1b187b3101e3e2ce (diff) | |
| parent | 60106c1e1ecdb0bb8ed37e1137c846f1a415dabf (diff) | |
| download | gitlab-ce-db46475821c4546438797a5580a479ca73a862ba.tar.gz | |
Merge branch 'gitaly-reuse-stubs' into 'master'
Reuse gRPC stubs instead of channels
Closes #31991 and gitaly#187
See merge request !11244
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/test_env.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 8e31c26591b..9bf9dc5d4b2 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -120,7 +120,7 @@ module TestEnv end def setup_gitaly - socket_path = Gitlab::GitalyClient.get_address('default').sub(/\Aunix:/, '') + socket_path = Gitlab::GitalyClient.address('default').sub(/\Aunix:/, '') gitaly_dir = File.dirname(socket_path) unless File.directory?(gitaly_dir) || system('rake', "gitlab:gitaly:install[#{gitaly_dir}]") @@ -133,7 +133,8 @@ module TestEnv def start_gitaly(gitaly_dir) gitaly_exec = File.join(gitaly_dir, 'gitaly') gitaly_config = File.join(gitaly_dir, 'config.toml') - @gitaly_pid = spawn(gitaly_exec, gitaly_config, [:out, :err] => '/dev/null') + log_file = Rails.root.join('log/gitaly-test.log').to_s + @gitaly_pid = spawn(gitaly_exec, gitaly_config, [:out, :err] => log_file) end def stop_gitaly |