From 4d2e646f21659a6540312779190b03aed91395d5 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Thu, 5 Oct 2017 13:20:20 +0200 Subject: CSIT-828: Fix the output of failed VAT execution Change-Id: Id387bd685142dcfaa17f0236e930e40e6c0bce5a Signed-off-by: Jan Gelety --- resources/libraries/python/ssh.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'resources/libraries/python/ssh.py') diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py index 5777c32001..87fc02d3dd 100644 --- a/resources/libraries/python/ssh.py +++ b/resources/libraries/python/ssh.py @@ -157,10 +157,10 @@ class SSH(object): if time() - start > timeout: raise SSHTimeout( - 'Timeout exception.\n' - 'Current contents of stdout buffer: {0}\n' - 'Current contents of stderr buffer: {1}\n' - .format(stdout.getvalue(), stderr.getvalue()) + 'Timeout exception during execution of command: {0}\n' + 'Current contents of stdout buffer: {1}\n' + 'Current contents of stderr buffer: {2}\n' + .format(cmd, stdout.getvalue(), stderr.getvalue()) ) sleep(0.1) @@ -260,6 +260,7 @@ class SSH(object): logger.error('Channel exit status ready') break except socket.timeout: + logger.error('Socket timeout: {0}'.format(buf)) raise Exception('Socket timeout: {0}'.format(buf)) return chan @@ -293,7 +294,10 @@ class SSH(object): logger.error('Channel exit status ready') break except socket.timeout: - raise Exception('Socket timeout: {0}'.format(buf)) + logger.error('Socket timeout during execution of command: ' + '{0}\nBuffer content:\n{1}'.format(cmd, buf)) + raise Exception('Socket timeout during execution of command: ' + '{0}\nBuffer content:\n{1}'.format(cmd, buf)) tmp = buf.replace(cmd.replace('\n', ''), '') for item in prompt: tmp.replace(item, '') -- cgit 1.2.3-korg