python/tests: move samba_tool_drs test to proper place

Signed-off-by: Bob Campbell <bobcampbell@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index dec26b418ab0d3499dd1821ce1f9d5ddc37214e0..83eff5216dcadb4d35080240b26fedec66ab5e50 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -670,7 +670,9 @@ planoldpythontestsuite(env, "ridalloc_exop",
                        extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
 
 for env in ['vampire_dc', 'promoted_dc']:
-    planoldpythontestsuite("%s:local" % env, "samba.tests.blackbox.samba_tool_drs",
+    planoldpythontestsuite("%s:local" % env, "samba_tool_drs",
+                           extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
+                           name="samba4.drs.samba_tool_drs.python(%s)" % env,
                            environ={'DC1': '$DC_SERVER', 'DC2': '$%s_SERVER' % env.upper()},
                            extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
     planoldpythontestsuite("%s:local" % env, "replica_sync",

diff --git a/python/samba/tests/blackbox/samba_tool_drs.py b/source4/torture/drs/python/samba_tool_drs.py
similarity index 99%
rename from python/samba/tests/blackbox/samba_tool_drs.py
rename to source4/torture/drs/python/samba_tool_drs.py
index df0e3d72104891a1a31237925a8b59d0b6a03e47..ccdba1de8504874c5a6a9c2c377fc3538b219b33 100644 (file)
--- a/python/samba/tests/blackbox/samba_tool_drs.py
+++ b/source4/torture/drs/python/samba_tool_drs.py
@@ -21,8 +21,9 @@ import samba.tests
 import shutil
 import os
 import ldb
+import drs_base
 
-class SambaToolDrsTests(samba.tests.BlackboxTestCase):
+class SambaToolDrsTests(drs_base.DrsBaseTestCase):
     """Blackbox test case for samba-tool drs."""
 
     def setUp(self):