tests:samba_tool: pass stdout and stderr to assertCmdSuccess()

[nivanova/samba-autobuild/.git] / python / samba / tests / samba_tool / base.py

diff --git a/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py
index de6cf18434811506ba663f3a7026776462051cf3..8f00534bf664df9b6bacd98fd42b3e4a540120bb 100644 (file)
--- a/python/samba/tests/samba_tool/base.py
+++ b/python/samba/tests/samba_tool/base.py
@@ -81,8 +81,9 @@ class SambaToolCmdTest(samba.tests.BlackboxTestCase):
         result = cmd._run("samba-tool %s %s" % (name, sub), *args)
         return (result, cmd.outf.getvalue(), cmd.errf.getvalue())
 
         result = cmd._run("samba-tool %s %s" % (name, sub), *args)
         return (result, cmd.outf.getvalue(), cmd.errf.getvalue())
 

-    def assertCmdSuccess(self, val, msg=""):
-        self.assertIsNone(val, msg)
+    def assertCmdSuccess(self, exit, out, err, msg=""):
+        self.assertIsNone(exit, msg="exit[%s] stdout[%s] stderr[%s]: %s" % (
+                          exit, out, err, msg))

 
     def assertCmdFail(self, val, msg=""):
         self.assertIsNotNone(val, msg)
 
     def assertCmdFail(self, val, msg=""):
         self.assertIsNotNone(val, msg)