Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-06-28 22:34:25 +0300
committerStan Hu <stanhu@gmail.com>2019-06-28 22:34:25 +0300
commit388a496443cf8b86e72c275ca63b14e8f059c8f6 (patch)
treeb45e89fe41aa89dd1cfcb5eb7c110e7097605aba /spec
parent638c8465259aa1a24f7085899e9f6d2fc7ebba9a (diff)
parent447ac5f99f94511b5551492b7301ed914a19a66a (diff)
Merge branch '63874-use-process-cpu-time-instead-of-thread-for-cpu-metrics' into 'master'
Use PROCESS_CPUTIME_ID for cpu time metrics Closes #63874 See merge request gitlab-org/gitlab-ce!30166
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/metrics/system_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/metrics/system_spec.rb b/spec/lib/gitlab/metrics/system_spec.rb
index b0603d96eb2..da87df15746 100644
--- a/spec/lib/gitlab/metrics/system_spec.rb
+++ b/spec/lib/gitlab/metrics/system_spec.rb
@@ -52,13 +52,13 @@ describe Gitlab::Metrics::System do
end
describe '.cpu_time' do
- it 'returns a Fixnum' do
+ it 'returns a Float' do
expect(described_class.cpu_time).to be_an(Float)
end
end
describe '.real_time' do
- it 'returns a Fixnum' do
+ it 'returns a Float' do
expect(described_class.real_time).to be_an(Float)
end
end