diff options
| author | Peter Leitzen <pleitzen@gitlab.com> | 2019-08-06 15:50:56 +0200 |
|---|---|---|
| committer | Peter Leitzen <pleitzen@gitlab.com> | 2019-08-06 15:52:57 +0200 |
| commit | 9f4e1e8fa7a405076a00f0861252295d5bfd8a2c (patch) | |
| tree | f909040d9ec7238c8756585bf7acb2df7c946670 | |
| parent | 4c1a5ba822109582d85a19ac4ce7e99e5cfa9641 (diff) | |
| download | gitlab-ce-33401-follow-up-from-add-prometheus-metrics-endpoint-and-basic-infrastructure-to-meter-code.tar.gz | |
Cleanup tmp directories in metrics controller spec33401-follow-up-from-add-prometheus-metrics-endpoint-and-basic-infrastructure-to-meter-code
| -rw-r--r-- | spec/controllers/metrics_controller_spec.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/spec/controllers/metrics_controller_spec.rb b/spec/controllers/metrics_controller_spec.rb index 84027119491..7fb3578cd0a 100644 --- a/spec/controllers/metrics_controller_spec.rb +++ b/spec/controllers/metrics_controller_spec.rb @@ -5,12 +5,19 @@ require 'spec_helper' describe MetricsController do include StubENV - let(:metrics_multiproc_dir) { Dir.mktmpdir } + let(:metrics_multiproc_dir) { @metrics_multiproc_dir } let(:whitelisted_ip) { '127.0.0.1' } let(:whitelisted_ip_range) { '10.0.0.0/24' } let(:ip_in_whitelisted_range) { '10.0.0.1' } let(:not_whitelisted_ip) { '10.0.1.1' } + around do |example| + Dir.mktmpdir do |path| + @metrics_multiproc_dir = path + example.run + end + end + before do stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false') allow(Prometheus::Client.configuration).to receive(:multiprocess_files_dir).and_return(metrics_multiproc_dir) |