aboutsummaryrefslogtreecommitdiff
path: root/rumba/ssh_support.py
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-09-18 12:57:57 +0200
committerSander Vrijders <sander.vrijders@ugent.be>2017-09-18 13:05:44 +0200
commita47f94f48fa4e6856ac1ac63e871aa8363035dc7 (patch)
tree894a1992d3aa7cbc0aa5e56e29ffe2ad03ac0ddd /rumba/ssh_support.py
parent2f160576cf94a5aaadf87c84d5e4153549acffaa (diff)
downloadrumba-a47f94f48fa4e6856ac1ac63e871aa8363035dc7.tar.gz
rumba-a47f94f48fa4e6856ac1ac63e871aa8363035dc7.zip
testbeds: emulab: Continue if experiment is swapped in
This will let rumba continue if the experiment is already swapped in in emulab, since it is not an error. It also adds the posibility to swap the experiment out from Rumba.
Diffstat (limited to 'rumba/ssh_support.py')
-rw-r--r--rumba/ssh_support.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py
index 64d17e6..8b07c13 100644
--- a/rumba/ssh_support.py
+++ b/rumba/ssh_support.py
@@ -163,9 +163,9 @@ def execute_commands(testbed, ssh_config, commands, time_out=3):
chan.exec_command(command)
except paramiko.ssh_exception.SSHException as e:
raise SSHException('Failed to execute command')
- if (chan.recv_exit_status() != 0):
- raise SSHException('A remote command returned an error')
o = _print_stream(stdout)
+ if (chan.recv_exit_status() != 0):
+ raise SSHException('A remote command returned an error.\n' + o)
ssh_client.close()
return o