diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-17 21:16:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-17 21:16:07 +0300 |
commit | d409d12963ae433979c54a8ba54f3a1dd4455e52 (patch) | |
tree | 25da3ed9d7cacbb38539c3682fae8827903ec9af /spec/commands | |
parent | 8432be20de0a29f4dde4980efe37d013c9e90034 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/commands')
-rw-r--r-- | spec/commands/metrics_server/metrics_server_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/commands/metrics_server/metrics_server_spec.rb b/spec/commands/metrics_server/metrics_server_spec.rb index b755801bb65..0178017ee37 100644 --- a/spec/commands/metrics_server/metrics_server_spec.rb +++ b/spec/commands/metrics_server/metrics_server_spec.rb @@ -47,7 +47,7 @@ RSpec.describe 'bin/metrics-server', :aggregate_failures do if @pid pgrp = Process.getpgid(@pid) - Timeout.timeout(5) do + Timeout.timeout(10) do Process.kill('TERM', -pgrp) Process.waitpid(@pid) end @@ -63,7 +63,7 @@ RSpec.describe 'bin/metrics-server', :aggregate_failures do it 'serves /metrics endpoint' do expect do - Timeout.timeout(5) do + Timeout.timeout(10) do http_ok = false until http_ok sleep 1 |