diff options
author | Stan Hu <stanhu@gmail.com> | 2018-06-20 16:33:22 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-06-20 16:33:22 +0000 |
commit | c9eb56d511eeda596741045ab1964bfba0e6186e (patch) | |
tree | a692b873fac674b35fbfed92fcee30b16a8115d8 /spec | |
parent | 40a66cb550cf7b5e1b0a6e3816b91026ba2dd6ca (diff) | |
parent | d527b468025922c04ba03edffb7ef33300ec9bb6 (diff) | |
download | gitlab-ce-c9eb56d511eeda596741045ab1964bfba0e6186e.tar.gz |
Merge branch 'remove-allocations-gem' into 'master'
Remove remaining traces of the Allocations Gem
See merge request gitlab-org/gitlab-ce!20029
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb index f66451c5188..81954fcf8c5 100644 --- a/spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb +++ b/spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb @@ -3,10 +3,6 @@ require 'spec_helper' describe Gitlab::Metrics::Samplers::InfluxSampler do let(:sampler) { described_class.new(5) } - after do - Allocations.stop if Gitlab::Metrics.mri? - end - describe '#start' do it 'runs once and gathers a sample at a given interval' do expect(sampler).to receive(:sleep).with(a_kind_of(Numeric)).twice diff --git a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb index 54781dd52fc..091645ee86f 100644 --- a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb +++ b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb @@ -8,10 +8,6 @@ describe Gitlab::Metrics::Samplers::RubySampler do allow(Gitlab::Metrics::NullMetric).to receive(:instance).and_return(null_metric) end - after do - Allocations.stop if Gitlab::Metrics.mri? - end - describe '#sample' do it 'samples various statistics' do expect(Gitlab::Metrics::System).to receive(:memory_usage) |