selftest: Rebase DrsBaseTestCase on SambaToolCmdTest

This then makes SambaToolCmdTest based on BlackboxTestCase.

This allows us to use better command output testing in the fsmo tests

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py
index c931af76b887bb0e7759344ec4e6b5c304f63080..b71a5b39338149b0ea98b565a9cc7ddf0071fd0a 100644 (file)
--- a/python/samba/tests/samba_tool/base.py
+++ b/python/samba/tests/samba_tool/base.py
@@ -29,7 +29,7 @@ from cStringIO import StringIO
 from samba.netcmd.main import cmd_sambatool
 import samba.tests
 
-class SambaToolCmdTest(samba.tests.TestCaseInTempDir):
+class SambaToolCmdTest(samba.tests.BlackboxTestCase):
 
     def getSamDB(self, *argv):
         """a convenience function to get a samdb instance so that we can query it"""

diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py
index 683987fdb6d10085cddd9dd51db1059342ee0b72..e97b065686a208a947123959555d899bf0364b19 100644 (file)
--- a/source4/torture/drs/python/drs_base.py
+++ b/source4/torture/drs/python/drs_base.py
@@ -25,6 +25,7 @@ import os
 
 sys.path.insert(0, "bin/python")
 import samba.tests
+from samba.tests.samba_tool.base import SambaToolCmdTest
 from samba import dsdb
 
 from ldb import (
@@ -34,7 +35,7 @@ from ldb import (
     )
 
 
-class DrsBaseTestCase(samba.tests.BlackboxTestCase):
+class DrsBaseTestCase(SambaToolCmdTest):
     """Base class implementation for all DRS python tests.
        It is intended to provide common initialization and
        and functionality used by all DRS tests in drs/python