diff options
| author | Bob Campbell <bobcampbell@catalyst.net.nz> | 2017-01-27 14:46:36 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-02-14 21:28:25 +0100 |
| commit | bc5dc536f8cc0ea36883dd3cf074bfd2c6da4b5c (patch) | |
| tree | dc520e5d439453bdbafb3acf31cb178a434b6f41 | |
| parent | 47db694f710b75cc7a565358499ca34c4e83676e (diff) | |
| download | samba-bc5dc536f8cc0ea36883dd3cf074bfd2c6da4b5c.tar.gz | |
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>
| -rwxr-xr-x | source4/selftest/tests.py | 4 | ||||
| -rw-r--r-- | source4/torture/drs/python/samba_tool_drs.py (renamed from python/samba/tests/blackbox/samba_tool_drs.py) | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index dec26b418ab..83eff5216dc 100755 --- 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 index df0e3d72104..ccdba1de850 100644 --- 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): |