utils: update CalledProcessError output python compat logic
We can leverage the parent's stderr setting now, but we can't get rid
of the output/stdout cleanup since Python 3.6 still does this.
Bug: None
Test: unittests
Change-Id: I52f2658d95aa4fdd08deabf68ad03599cb5b472a
diff --git a/rh/utils_unittest.py b/rh/utils_unittest.py
index 277abff..bf720a7 100755
--- a/rh/utils_unittest.py
+++ b/rh/utils_unittest.py
@@ -117,6 +117,22 @@
err = rh.utils.CalledProcessError(0, ['mycmd'])
self.assertNotEqual('', repr(err))
+ def test_output(self):
+ """Make sure .output is removed and .stdout works."""
+ e = rh.utils.CalledProcessError(
+ 0, ['true'], stdout='STDOUT', stderr='STDERR')
+ with self.assertRaises(AttributeError):
+ assert e.output is None
+ assert e.stdout == 'STDOUT'
+ assert e.stderr == 'STDERR'
+
+ e.stdout = 'STDout'
+ e.stderr = 'STDerr'
+ with self.assertRaises(AttributeError):
+ assert e.output is None
+ assert e.stdout == 'STDout'
+ assert e.stderr == 'STDerr'
+
class RunCommandTests(unittest.TestCase):
"""Verify behavior of run helper."""
