s4/samba.tests: Raise BlackboxProcessError exception in case check_output method...

This way the caller gets the chance to receive STDOUT and STDERR for
a failed process.
We may use this info to check if a process has failed properly,
e.g. with expected output

diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index 5a0e23daee4f9950ec885d5676ec1b0af1d133bf..58e4130998026cd9f7479ec95eb66f4f446ae3e1 100644 (file)
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -151,10 +151,10 @@ class BlackboxTestCase(TestCase):
 
     def check_output(self, line):
         line = self._make_cmdline(line)
-        p = subprocess.Popen(line, stdout=subprocess.PIPE, shell=True, close_fds=True)
+        p = subprocess.Popen(line, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, close_fds=True)
         retcode = p.wait()
         if retcode:
-            raise subprocess.CalledProcessError(retcode, line)
+            raise BlackboxProcessError(retcode, line, p.stdout.read(), p.stderr.read())
         return p.stdout.read()
 
 def connect_samdb(samdb_url, lp=None, session_info=None, credentials=None,