From f024df8170f85d7497a8d2bbc3bac537ddf7064e Mon Sep 17 00:00:00 2001
From: Dennis Dmitriev <ddmitriev@mirantis.com>
Date: Mon, 20 Feb 2017 21:20:56 +0200
Subject: [PATCH] Reduce check-call error message to brief output

Change-Id: I04a737201f3312331d5fe719474f9bc9bb2b808f
---
 devops/helpers/ssh_client.py                   | 8 ++++----
 devops/helpers/subprocess_runner.py            | 8 ++++----
 devops/tests/helpers/test_ssh_client.py        | 6 ++++++
 devops/tests/helpers/test_subprocess_runner.py | 7 +++++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/devops/helpers/ssh_client.py b/devops/helpers/ssh_client.py
index 9ea2b71a..dca0cdd3 100644
--- a/devops/helpers/ssh_client.py
+++ b/devops/helpers/ssh_client.py
@@ -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
diff --git a/devops/helpers/subprocess_runner.py b/devops/helpers/subprocess_runner.py
index 1072bdb1..3d29455c 100644
--- a/devops/helpers/subprocess_runner.py
+++ b/devops/helpers/subprocess_runner.py
@@ -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
diff --git a/devops/tests/helpers/test_ssh_client.py b/devops/tests/helpers/test_ssh_client.py
index d829bf43..cb86f50e 100644
--- a/devops/tests/helpers/test_ssh_client.py
+++ b/devops/tests/helpers/test_ssh_client.py
@@ -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']}
diff --git a/devops/tests/helpers/test_subprocess_runner.py b/devops/tests/helpers/test_subprocess_runner.py
index 8b80cb44..f1c1ee2f 100644
--- a/devops/tests/helpers/test_subprocess_runner.py
+++ b/devops/tests/helpers/test_subprocess_runner.py
@@ -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()