Commit 2983980a authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix-flaky-mixins-specs' into 'master'

Fix flaky mixins

Closes #34340

See merge request gitlab-org/gitlab!18758
parents 31a2c541 d96ffaf2
...@@ -40,7 +40,10 @@ describe Gitlab::Cluster::Mixins::PumaCluster do ...@@ -40,7 +40,10 @@ describe Gitlab::Cluster::Mixins::PumaCluster do
yield(process.pid) yield(process.pid)
ensure ensure
Process.kill(:KILL, process.pid) unless process.eof? begin
Process.kill(:KILL, process.pid)
rescue Errno::ESRCH
end
end end
end end
end end
......
...@@ -54,7 +54,10 @@ describe Gitlab::Cluster::Mixins::UnicornHttpServer do ...@@ -54,7 +54,10 @@ describe Gitlab::Cluster::Mixins::UnicornHttpServer do
yield(process.pid) yield(process.pid)
ensure ensure
Process.kill(:KILL, process.pid) unless process.eof? begin
Process.kill(:KILL, process.pid)
rescue Errno::ESRCH
end
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment