diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-14 11:39:19 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-14 11:39:19 +0000 |
| commit | 4b964011cfd6861403726248574f5926edc5d495 (patch) | |
| tree | 9decb7fc9224b6e8625200200eeacf33eae02183 /spec/lib | |
| parent | ab3fb00c429133ac4aa98887314dba3a167b919c (diff) | |
| parent | 120fbbd4875f340b5c863b7e0e3eabcb2796e15d (diff) | |
| download | gitlab-ce-4b964011cfd6861403726248574f5926edc5d495.tar.gz | |
Merge branch '18528-cpu-time-instrumentation' into 'master'
Measure CPU time for instrumented methods
See merge request !4640
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/metrics/instrumentation_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/metrics/instrumentation_spec.rb b/spec/lib/gitlab/metrics/instrumentation_spec.rb index 220e86924a2..c6e979b69a4 100644 --- a/spec/lib/gitlab/metrics/instrumentation_spec.rb +++ b/spec/lib/gitlab/metrics/instrumentation_spec.rb @@ -57,7 +57,7 @@ describe Gitlab::Metrics::Instrumentation do and_return(transaction) expect(transaction).to receive(:add_metric). - with(described_class::SERIES, an_instance_of(Hash), + with(described_class::SERIES, hash_including(:duration, :cpu_duration), method: 'Dummy.foo') @dummy.foo @@ -137,7 +137,7 @@ describe Gitlab::Metrics::Instrumentation do and_return(transaction) expect(transaction).to receive(:add_metric). - with(described_class::SERIES, an_instance_of(Hash), + with(described_class::SERIES, hash_including(:duration, :cpu_duration), method: 'Dummy#bar') @dummy.new.bar |