diff options
| author | Paweł Chojnacki <pawel@chojnacki.ws> | 2017-07-19 11:54:39 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-19 11:54:39 +0300 |
| commit | 2c3d52161af2f170bdb644b96b6ffe5da0c1df10 (patch) | |
| tree | a4e5d5766c8c74cd782ea18e46afeddf8ae027e1 /spec | |
| parent | fa8ec52a717a1e019e867ebd884c20f5f17bbe02 (diff) | |
Update Prometheus gem to version that explicitly calls `munmap`
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/controllers/metrics_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/controllers/metrics_controller_spec.rb b/spec/controllers/metrics_controller_spec.rb index 8964d89b438..7b0976e3e67 100644 --- a/spec/controllers/metrics_controller_spec.rb +++ b/spec/controllers/metrics_controller_spec.rb @@ -12,7 +12,7 @@ describe MetricsController do before do stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') - stub_env('prometheus_multiproc_dir', metrics_multiproc_dir) + allow(Prometheus::Client.configuration).to receive(:multiprocess_files_dir).and_return(metrics_multiproc_dir) allow(Gitlab::Metrics).to receive(:prometheus_metrics_enabled?).and_return(true) allow(Settings.monitoring).to receive(:ip_whitelist).and_return([whitelisted_ip, whitelisted_ip_range]) end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b8ed1e18de0..5d5715b10ff 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,7 +3,6 @@ SimpleCovEnv.start! ENV["RAILS_ENV"] ||= 'test' ENV["IN_MEMORY_APPLICATION_SETTINGS"] = 'true' -# ENV['prometheus_multiproc_dir'] = 'tmp/prometheus_multiproc_dir_test' require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' |