summaryrefslogtreecommitdiff
path: root/spec/support/test_env.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-17 17:42:43 +0200
committerRémy Coutable <remy@rymai.me>2017-10-17 17:42:43 +0200
commit73e3d6b8a0594ff081103ce1bbb7cb8370503975 (patch)
tree20c15cd4c2586db81d98fdccc1153dee9018c08e /spec/support/test_env.rb
parenta3368a988d9ed90dfe67b34017782d45b5897574 (diff)
downloadgitlab-ce-73e3d6b8a0594ff081103ce1bbb7cb8370503975.tar.gz
Ensure no exception is raised if the Gitaly process is already gone in TestEnv.cleanup
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/support/test_env.rb')
-rw-r--r--spec/support/test_env.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index a27bfdee3d2..fff120fcb88 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -182,6 +182,8 @@ module TestEnv
return unless @gitaly_pid
Process.kill('KILL', @gitaly_pid)
+ rescue Errno::ESRCH
+ # The process can already be gone if the test run was INTerrupted.
end
def setup_factory_repo