diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 06:09:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 06:09:00 +0300 |
commit | 56201db1dc66f3a2d598f6f8da0bec170dc26ba1 (patch) | |
tree | 8317b0a17c76866b981b497b13786dadceee5abf /spec/lib/gitlab | |
parent | ce2a803dc413f289352deecbf2cfd32896c8b2ef (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab')
-rw-r--r-- | spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb | 7 |
1 files changed, 5 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 ac4cf1734a5..f294d7f7fcd 100644 --- a/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb +++ b/spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb @@ -18,7 +18,10 @@ describe Gitlab::SidekiqLogging::StructuredLogger do "jid" => "da883554ee4fe414012f5f42", "created_at" => created_at.to_f, "enqueued_at" => created_at.to_f, - "correlation_id" => 'cid' + "correlation_id" => 'cid', + "error_message" => "wrong number of arguments (2 for 3)", + "error_class" => "ArgumentError", + "error_backtrace" => [] } end @@ -26,7 +29,7 @@ describe Gitlab::SidekiqLogging::StructuredLogger do let(:clock_thread_cputime_start) { 0.222222299 } let(:clock_thread_cputime_end) { 1.333333799 } let(:start_payload) do - job.merge( + job.except('error_backtrace', 'error_class', 'error_message').merge( 'message' => 'TestWorker JID-da883554ee4fe414012f5f42: start', 'job_status' => 'start', 'pid' => Process.pid, |