diff options
| author | Lumir Balhar <lbalhar@redhat.com> | 2017-01-17 11:05:44 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-03-10 07:31:12 +0100 |
| commit | 4ebd877ec0447f9ecf44c43e5dce01d895995f9d (patch) | |
| tree | e05fd2ea4f36b273859c16d076466c8335a2088e /source4/selftest | |
| parent | 64bc64ce647164e3544bfdd231c3f2d1239d2ca3 (diff) | |
| download | samba-4ebd877ec0447f9ecf44c43e5dce01d895995f9d.tar.gz | |
python: selftest: Add possibility to run old Python test suites with Python 3
Add possibility to execute old Python test suites with Python 3
and enable tests with Python 3 of ported samba.gensec module.
Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'source4/selftest')
| -rwxr-xr-x | source4/selftest/tests.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 3786f735dd7..c2c5486d43e 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -537,7 +537,9 @@ for env in ["ad_dc:local", "s4member:local", "nt4_dc:local", "ad_member:local", skiptestsuite("samba.nss.test using winbind(%s)" % env, "nsstest not available") subunitrun = valgrindify(python) + " " + os.path.join(samba4srcdir, "scripting/bin/subunitrun") -def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, extra_args=[]): +if extra_python is not None: + subunitrun3 = valgrindify(extra_python) + " " + os.path.join(samba4srcdir, "scripting/bin/subunitrun") +def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, extra_args=[], py3_compatible=False): environ = dict(environ) py_path = list(extra_path) if py_path: @@ -548,8 +550,12 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex if name is None: name = module plantestsuite_loadlist(name, env, args) + if py3_compatible and extra_python is not None: + args[0] = subunitrun3 + plantestsuite_loadlist(name, env, args) -planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.gensec", extra_args=['-U"$USERNAME%$PASSWORD"']) + +planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.gensec", extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True) planoldpythontestsuite("none", "simple", extra_path=["%s/lib/tdb/python/tests" % srcdir()], name="tdb.python") planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.sam") planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dsdb") |