sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-31 10:11:17 +00:00
Code Issues Releases Wiki Activity

ssh: fixing rasing of CalledProcessErrorWithStderr

Browse Source 
CalledProcessErrorWithStderr is a subclass of CalledProcessError that
also takes stderr output. Both that and normal output must be passed as
keyword arguments. They were being passed as keyword arguments inside
_scp() of SshConnection, causing cryptic errors to appear.

Additionally, "output" was not being properly poped off before invoking
super's init.
This commit is contained in:
Sergei Trofimov 2016-08-23 17:14:45 +01:00
parent fe259dca05
commit 4ea4bc8631
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wlauto/utils/misc.py
View File

@ -85,6 +85,7 @@ class TimeoutError(Exception):
class CalledProcessErrorWithStderr(CalledProcessError): class CalledProcessErrorWithStderr(CalledProcessError):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.output = kwargs.pop("output")
self.error = kwargs.pop("error") self.error = kwargs.pop("error")
super(CalledProcessErrorWithStderr, self).__init__(*args, **kwargs) super(CalledProcessErrorWithStderr, self).__init__(*args, **kwargs)

3
wlauto/utils/ssh.py
View File

@ -245,7 +245,8 @@ class SshShell(object):
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise CalledProcessErrorWithStderr(e.returncode, raise CalledProcessErrorWithStderr(e.returncode,
e.cmd.replace(pass_string, ''), e.cmd.replace(pass_string, ''),
e.output, getattr(e, 'error', '')) output=e.output,
error=getattr(e, 'error', ''))
except TimeoutError as e: except TimeoutError as e:
raise TimeoutError(e.command.replace(pass_string, ''), e.output) raise TimeoutError(e.command.replace(pass_string, ''), e.output)