From 8cc5f2790908ba9bb8eecba2b78a3c5a88c77b90 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 13 Dec 2019 12:07:41 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/workers/ci/archive_traces_cron_worker_spec.rb | 2 +- spec/workers/run_pipeline_schedule_worker_spec.rb | 4 ++-- spec/workers/stuck_ci_jobs_worker_spec.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/workers') diff --git a/spec/workers/ci/archive_traces_cron_worker_spec.rb b/spec/workers/ci/archive_traces_cron_worker_spec.rb index 01232e2a58b..291fe54c4e3 100644 --- a/spec/workers/ci/archive_traces_cron_worker_spec.rb +++ b/spec/workers/ci/archive_traces_cron_worker_spec.rb @@ -63,7 +63,7 @@ describe Ci::ArchiveTracesCronWorker do let!(:build) { create(:ci_build, :success, :trace_live, finished_at: finished_at) } before do - allow(Gitlab::Sentry).to receive(:track_exception) + allow(Gitlab::Sentry).to receive(:track_and_raise_for_dev_exception) allow_any_instance_of(Gitlab::Ci::Trace).to receive(:archive!).and_raise('Unexpected error') end diff --git a/spec/workers/run_pipeline_schedule_worker_spec.rb b/spec/workers/run_pipeline_schedule_worker_spec.rb index 2bf1d470b09..1d376e1f02a 100644 --- a/spec/workers/run_pipeline_schedule_worker_spec.rb +++ b/spec/workers/run_pipeline_schedule_worker_spec.rb @@ -43,10 +43,10 @@ describe RunPipelineScheduleWorker do allow(Ci::CreatePipelineService).to receive(:new) { raise ActiveRecord::StatementInvalid } expect(Gitlab::Sentry) - .to receive(:track_exception) + .to receive(:track_and_raise_for_dev_exception) .with(ActiveRecord::StatementInvalid, issue_url: 'https://gitlab.com/gitlab-org/gitlab-foss/issues/41231', - extra: { schedule_id: pipeline_schedule.id } ).once + schedule_id: pipeline_schedule.id).once end it 'increments Prometheus counter' do diff --git a/spec/workers/stuck_ci_jobs_worker_spec.rb b/spec/workers/stuck_ci_jobs_worker_spec.rb index 59707409b5a..48a20f498b7 100644 --- a/spec/workers/stuck_ci_jobs_worker_spec.rb +++ b/spec/workers/stuck_ci_jobs_worker_spec.rb @@ -30,8 +30,8 @@ describe StuckCiJobsWorker do it "does drop the job and logs the reason" do job.update_columns(yaml_variables: '[{"key" => "value"}]') - expect(Gitlab::Sentry).to receive(:track_acceptable_exception) - .with(anything, a_hash_including(extra: a_hash_including(build_id: job.id))) + expect(Gitlab::Sentry).to receive(:track_exception) + .with(anything, a_hash_including(build_id: job.id)) .once .and_call_original -- cgit v1.2.1