From a47f94f48fa4e6856ac1ac63e871aa8363035dc7 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Mon, 18 Sep 2017 12:57:57 +0200 Subject: 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. --- rumba/ssh_support.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rumba/ssh_support.py') 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 -- cgit v1.2.3