Merge "Reduce check-call error message to brief output"

This commit is contained in:
Jenkins 2017-02-27 09:55:05 +00:00 committed by Gerrit Code Review
commit 671ccc7a12
4 changed files with 21 additions and 8 deletions

View File

@ -640,8 +640,8 @@ class SSHClient(six.with_metaclass(_MemorizedSSH, object)):
raise error.DevopsCalledProcessError(
command, ret['exit_code'],
expected=expected,
stdout=ret['stdout_str'],
stderr=ret['stderr_str'])
stdout=ret['stdout_brief'],
stderr=ret['stdout_brief'])
return ret
def check_stderr(
@ -675,8 +675,8 @@ class SSHClient(six.with_metaclass(_MemorizedSSH, object)):
raise error.DevopsCalledProcessError(
command,
ret['exit_code'],
stdout=ret['stdout_str'],
stderr=ret['stderr_str'])
stdout=ret['stdout_brief'],
stderr=ret['stdout_brief'])
return ret
@classmethod

View File

@ -244,8 +244,8 @@ class Subprocess(six.with_metaclass(metaclasses.SingletonMeta, object)):
raise error.DevopsCalledProcessError(
command, ret['exit_code'],
expected=expected,
stdout=ret['stdout_str'],
stderr=ret['stderr_str'])
stdout=ret['stdout_brief'],
stderr=ret['stderr_brief'])
return ret
@classmethod
@ -281,6 +281,6 @@ class Subprocess(six.with_metaclass(metaclasses.SingletonMeta, object)):
if raise_on_err:
raise error.DevopsCalledProcessError(
command, ret['exit_code'],
stdout=ret['stdout_str'],
stderr=ret['stderr_str'])
stdout=ret['stdout_brief'],
stderr=ret['stderr_brief'])
return ret

View File

@ -1406,6 +1406,8 @@ class TestExecute(unittest.TestCase):
return_value = {
'stderr_str': '0\n1',
'stdout_str': '2\n3',
'stderr_brief': '0\n1',
'stdout_brief': '2\n3',
'exit_code': exit_code,
'stderr': [b' \n', b'0\n', b'1\n', b' \n'],
'stdout': [b' \n', b'2\n', b'3\n', b' \n']}
@ -1436,6 +1438,8 @@ class TestExecute(unittest.TestCase):
return_value = {
'stderr_str': '0\n1',
'stdout_str': '2\n3',
'stderr_brief': '0\n1',
'stdout_brief': '2\n3',
'exit_code': exit_code,
'stderr': [b' \n', b'0\n', b'1\n', b' \n'],
'stdout': [b' \n', b'2\n', b'3\n', b' \n']}
@ -1469,6 +1473,8 @@ class TestExecute(unittest.TestCase):
return_value = {
'stderr_str': '',
'stdout_str': '2\n3',
'stderr_brief': '',
'stdout_brief': '2\n3',
'exit_code': 0,
'stderr': [],
'stdout': [b' \n', b'2\n', b'3\n', b' \n']}

View File

@ -153,6 +153,8 @@ class TestSubprocessRunnerHelpers(unittest.TestCase):
return_value = {
'stderr_str': '0\n1',
'stdout_str': '2\n3',
'stderr_brief': '0\n1',
'stdout_brief': '2\n3',
'exit_code': exit_code,
'stderr': [b' \n', b'0\n', b'1\n', b' \n'],
'stdout': [b' \n', b'2\n', b'3\n', b' \n']}
@ -183,6 +185,8 @@ class TestSubprocessRunnerHelpers(unittest.TestCase):
return_value = {
'stderr_str': '0\n1',
'stdout_str': '2\n3',
'stderr_brief': '0\n1',
'stdout_brief': '2\n3',
'exit_code': exit_code,
'stderr': [b' \n', b'0\n', b'1\n', b' \n'],
'stdout': [b' \n', b'2\n', b'3\n', b' \n']}
@ -215,6 +219,8 @@ class TestSubprocessRunnerHelpers(unittest.TestCase):
return_value = {
'stderr_str': '',
'stdout_str': '2\n3',
'stderr_brief': '',
'stdout_brief': '2\n3',
'exit_code': 0,
'stderr': [],
'stdout': [b' \n', b'2\n', b'3\n', b' \n']}
@ -235,6 +241,7 @@ class TestSubprocessRunnerHelpers(unittest.TestCase):
self.assertEqual(result, return_value)
return_value['stderr_str'] = '0\n1'
return_value['stderr_brief'] = '0\n1'
return_value['stderr'] = [b' \n', b'0\n', b'1\n', b' \n']
check_call.reset_mock()