diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-06 09:10:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-06 09:10:35 +0300 |
| commit | 25ceb3dc1c387950d777b71aabde00849d4c7bf9 (patch) | |
| tree | 755188dc8d772ad10fb52f6eaa75a499ee15325a /spec/config | |
| parent | 0fbe2f816ecef98003377154b479d350f13597d7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/config')
| -rw-r--r-- | spec/config/mail_room_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb index 55f8fdd78ba..ec306837361 100644 --- a/spec/config/mail_room_spec.rb +++ b/spec/config/mail_room_spec.rb @@ -18,8 +18,9 @@ RSpec.describe 'mail_room.yml' do result = Gitlab::Popen.popen_with_detail(%W(ruby -rerb -e #{cmd}), absolute_path('config'), vars) output = result.stdout + errors = result.stderr status = result.status - raise "Error interpreting #{mailroom_config_path}: #{output}" unless status == 0 + raise "Error interpreting #{mailroom_config_path}: #{output}\n#{errors}" unless status == 0 YAML.safe_load(output, permitted_classes: [Symbol]) end |