diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-05-30 16:48:16 +0300 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-30 16:48:16 +0300 |
| commit | 097df362264e8b75afbaee963bee36acecb67bca (patch) | |
| tree | 727940a81ae9889120f65379dd94b29f13e2f359 /spec | |
| parent | 0cf09f057139ce464698f27450a1caadc99a647e (diff) | |
Fix gitaly-ruby bundle poisoning in CI (10-8-stable)
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/helpers/test_env.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 1dad39fdab3..57aa07cf4fa 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -159,7 +159,11 @@ module TestEnv end spawn_script = Rails.root.join('scripts/gitaly-test-spawn').to_s - @gitaly_pid = Bundler.with_original_env { IO.popen([spawn_script], &:read).to_i } + Bundler.with_original_env do + raise "gitaly spawn failed" unless system(spawn_script) + end + @gitaly_pid = Integer(File.read('tmp/tests/gitaly.pid')) + Kernel.at_exit { stop_gitaly } wait_gitaly |