diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-05 13:50:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-05 13:50:03 +0000 |
| commit | 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77 (patch) | |
| tree | b171476c60bec5cacffbf1b65b09f83c8d6ce44f /spec/support | |
| parent | faf2ce89cd4eafdccb78823cf1a32c338a8d9a79 (diff) | |
| parent | 6eb9e981c61969a904ccbae2c5f52f562b02d199 (diff) | |
| download | gitlab-ce-10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77.tar.gz | |
Merge branch 'prometheus-integration-test-setting-fix' into 'master'
Added rescue block for the test method for the prometheus service
Closes #31451
See merge request !10994
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/prometheus_helpers.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/support/prometheus_helpers.rb b/spec/support/prometheus_helpers.rb index cc79b11616a..a204365431b 100644 --- a/spec/support/prometheus_helpers.rb +++ b/spec/support/prometheus_helpers.rb @@ -33,6 +33,10 @@ module PrometheusHelpers }) end + def stub_prometheus_request_with_exception(url, exception_type) + WebMock.stub_request(:get, url).to_raise(exception_type) + end + def stub_all_prometheus_requests(environment_slug, body: nil, status: 200) stub_prometheus_request( prometheus_query_url(prometheus_memory_query(environment_slug)), |