diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 03:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 03:09:12 +0300 |
| commit | d43aaf286fe6b8e8383e73ea580274d8841608d7 (patch) | |
| tree | ca03542a55583538a1ec13023dffed20457407b5 /spec/lib/gitlab/sidekiq_middleware | |
| parent | 87af6f2e0590af0ed1bb3e5de1bb5d21855a94d2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/sidekiq_middleware')
| -rw-r--r-- | spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb b/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb index 23c5b59922b..3343587beff 100644 --- a/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb @@ -67,7 +67,7 @@ describe Gitlab::SidekiqMiddleware::ServerMetrics do allow(Gitlab::Metrics::System).to receive(:monotonic_time).and_return(monotonic_time_before, monotonic_time_after) allow(Gitlab::InstrumentationHelper).to receive(:queue_duration_for_job).with(job).and_return(queue_duration_for_job) allow(ActiveRecord::LogSubscriber).to receive(:runtime).and_return(db_duration * 1000) - allow(Gitlab::GitalyClient).to receive(:query_time).and_return(gitaly_duration) + allow(subject).to receive(:get_gitaly_time).and_return(gitaly_duration) expect(running_jobs_metric).to receive(:increment).with(labels, 1) expect(running_jobs_metric).to receive(:increment).with(labels, -1) |