diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /spec/lib/gitlab/sidekiq_logging | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'spec/lib/gitlab/sidekiq_logging')
-rw-r--r-- | spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb index 537844df72f..731c509e221 100644 --- a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb +++ b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb @@ -69,7 +69,7 @@ RSpec.describe Gitlab::SidekiqLogging::StructuredLogger do expect do call_subject(job, 'test_queue') do raise ArgumentError, 'Something went wrong' - rescue + rescue StandardError raise Sidekiq::JobRetry::Skip end end.to raise_error(Sidekiq::JobRetry::Skip) @@ -86,7 +86,7 @@ RSpec.describe Gitlab::SidekiqLogging::StructuredLogger do expect do call_subject(job, 'test_queue') do raise ArgumentError, 'Something went wrong' - rescue + rescue StandardError raise Sidekiq::JobRetry::Handled end end.to raise_error(Sidekiq::JobRetry::Handled) @@ -293,6 +293,16 @@ RSpec.describe Gitlab::SidekiqLogging::StructuredLogger do end end end + + context 'when instrumentation data is not loaded' do + before do + allow(logger).to receive(:info) + end + + it 'does not raise exception' do + expect { subject.call(job.dup, 'test_queue') {} }.not_to raise_error + end + end end describe '#add_time_keys!' do |