sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

selftest: don't hardcode '.python3' for extra-python tests

Browse Source 
Instead of hardcoding '.python3' we now hardcode the extra python
exe (which will be python2 for a default python3 build)

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power 2018-11-29 21:18:07 +00:00 committed by Noel Power
parent 2fb74e6ad3
commit e3c37bbad4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
selftest/selftesthelpers.py
View File

@ -150,7 +150,8 @@ def planpythontestsuite(env, module, name=None, extra_path=None,
if py3_compatible and extra_python is not None:
# Plan one more test for Python 3 compatible module
args[0] = extra_python
plantestsuite_loadlist(name + ".python3", env, pypath + args)
python_name = os.path.basename(extra_python)
plantestsuite_loadlist(name + "." + python_name, env, pypath + args)
def get_env_torture_options():

3
source4/selftest/tests.py
View File

@ -625,7 +625,8 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex
plantestsuite_loadlist(name, env, args)
if py3_compatible and extra_python is not None:
args[args.index(subunitrun)] = subunitrun3
plantestsuite_loadlist(name + ".python3", env, args)
python_name = os.path.basename(extra_python)
plantestsuite_loadlist(name + "." + python_name, env, args)
# Run complex search expressions test once for each database backend.
# Right now ad_dc has mdb and ad_dc_ntvfs has tdb