diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:08:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:08:05 +0300 |
| commit | 184c2ced0761bd8dd7032619d16d3983fed7944a (patch) | |
| tree | cc82b32ee7c1797509da3cf384617e4ffa2e1733 /spec/lib/gitlab/cluster/mixins | |
| parent | 238d22c07218adf2b8f3db630ee8b74ca6f29df5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/cluster/mixins')
| -rw-r--r-- | spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb b/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb index 038b72075ad..1eddf488c5d 100644 --- a/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb +++ b/spec/lib/gitlab/cluster/mixins/puma_cluster_spec.rb @@ -40,7 +40,10 @@ describe Gitlab::Cluster::Mixins::PumaCluster do yield(process.pid) ensure - Process.kill(:KILL, process.pid) unless process.eof? + begin + Process.kill(:KILL, process.pid) + rescue Errno::ESRCH + end end end end diff --git a/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb b/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb index 43176e38b2b..2b3a267991c 100644 --- a/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb +++ b/spec/lib/gitlab/cluster/mixins/unicorn_http_server_spec.rb @@ -54,7 +54,10 @@ describe Gitlab::Cluster::Mixins::UnicornHttpServer do yield(process.pid) ensure - Process.kill(:KILL, process.pid) unless process.eof? + begin + Process.kill(:KILL, process.pid) + rescue Errno::ESRCH + end end end end |