From 3905cab1ea684cfc2db36789068d808d9119422e Mon Sep 17 00:00:00 2001 From: "Vladimir Sharshov (warpc)" Date: Thu, 15 Dec 2016 22:48:45 +0300 Subject: [PATCH] Compact nailgun hook error message This change change error message by adding '\n\n' before error details which give Fuel UI ability to hide this part of message. Change-Id: I2e93ee3aa0aae183cd320d2438f781a975c5e70f Closes-Bug: #1614422 --- lib/astute/nailgun_hooks.rb | 4 ++-- spec/unit/nailgun_hooks_spec.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/astute/nailgun_hooks.rb b/lib/astute/nailgun_hooks.rb index fa93bdb2..9cf031ec 100644 --- a/lib/astute/nailgun_hooks.rb +++ b/lib/astute/nailgun_hooks.rb @@ -57,9 +57,9 @@ module Astute end error_message = 'Failed to execute hook' error_message += " '#{hook_name}'" if hook_name - error_message += " #{hook_return['error']}" + error_message += "\n\n#{hook_return['error']}" @ctx.report_and_update_status('nodes' => nodes, 'error' => error_message) - error_message += "\n\n#{hook.to_yaml}" + error_message += "#{hook.to_yaml}" raise Astute::DeploymentEngineError, error_message diff --git a/spec/unit/nailgun_hooks_spec.rb b/spec/unit/nailgun_hooks_spec.rb index 788f6efa..0f04a074 100644 --- a/spec/unit/nailgun_hooks_spec.rb +++ b/spec/unit/nailgun_hooks_spec.rb @@ -304,7 +304,7 @@ describe Astute::NailgunHooks do 'error_msg' => error_msg }, ], - 'error' => "Failed to execute hook 'shell-example-1.0' #{error_msg}" + 'error' => "Failed to execute hook 'shell-example-1.0'\n\n#{error_msg}" } ) @@ -478,7 +478,7 @@ describe Astute::NailgunHooks do 'error_msg' => error_msg }, ], - 'error' => "Failed to execute hook 'copy-example-1.0' #{error_msg}" + 'error' => "Failed to execute hook 'copy-example-1.0'\n\n#{error_msg}" } ) @@ -1073,7 +1073,7 @@ describe Astute::NailgunHooks do 'error_msg' => error_msg }, ], - 'error' => "Failed to execute hook 'puppet-example-1.0' #{error_msg}" + 'error' => "Failed to execute hook 'puppet-example-1.0'\n\n#{error_msg}" } )