summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2017-08-23 10:05:27 +0200
committerVarac <varac@leap.se>2017-08-23 10:05:27 +0200
commit27ae20913664d97918effd7308f30e0a61aa4b24 (patch)
tree3473fd5ea0c0d97e3901404053956067e0041ffa
parent9679c7e1cd5d7b5824fa99b070dc0899779c92ec (diff)
parent61d8d9e0e35dc9759ec93b517b0a67df1c3506d3 (diff)
Merge remote-tracking branch 'elijah_acab/bugfix/testcontinue'
-rw-r--r--lib/leap_cli/commands/test.rb2
-rw-r--r--lib/leap_cli/ssh/backend.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/leap_cli/commands/test.rb b/lib/leap_cli/commands/test.rb
index 70eb00fd..e2815aae 100644
--- a/lib/leap_cli/commands/test.rb
+++ b/lib/leap_cli/commands/test.rb
@@ -35,7 +35,7 @@ module LeapCli; module Commands
SSH::remote_command(node, options) do |ssh, host|
ssh.stream(test_cmd(options), :raise_error => true, :log_wrap => true)
end
- rescue LeapCli::SSH::ExecuteError
+ rescue LeapCli::SSH::TimeoutError, SSHKit::Runner::ExecuteError, SSHKit::Command::Failed
if options[:continue]
exit_status(1)
else
diff --git a/lib/leap_cli/ssh/backend.rb b/lib/leap_cli/ssh/backend.rb
index 3894d815..599fc9a0 100644
--- a/lib/leap_cli/ssh/backend.rb
+++ b/lib/leap_cli/ssh/backend.rb
@@ -178,7 +178,7 @@ module LeapCli
rescue StandardError => exc
if exc.is_a?(SSHKit::Command::Failed) || exc.is_a?(SSHKit::Runner::ExecuteError)
if @options[:raise_error]
- raise LeapCli::SSH::ExecuteError, exc.to_s
+ raise exc
elsif @options[:fail_msg]
@logger.log(@options[:fail_msg], host: @host.hostname, :color => :red)
else