summaryrefslogtreecommitdiff
path: root/selftest/selftesthelpers.py
diff options
context:
space:
mode:
authorLumir Balhar <lbalhar@redhat.com>2017-01-17 11:05:44 +0100
committerAndrew Bartlett <abartlet@samba.org>2017-03-10 07:31:12 +0100
commit4ebd877ec0447f9ecf44c43e5dce01d895995f9d (patch)
treee05fd2ea4f36b273859c16d076466c8335a2088e /selftest/selftesthelpers.py
parent64bc64ce647164e3544bfdd231c3f2d1239d2ca3 (diff)
downloadsamba-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 'selftest/selftesthelpers.py')
-rw-r--r--selftest/selftesthelpers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index b0ece36d0f5..6b22a16bfa5 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -46,7 +46,7 @@ else:
has_perl_test_more = False
python = os.getenv("PYTHON", "python")
-extra_python = os.getenv("EXTRA_PYTHON", "python3")
+extra_python = os.getenv("EXTRA_PYTHON", None)
tap2subunit = python + " " + os.path.join(srcdir(), "selftest", "tap2subunit")
@@ -137,7 +137,7 @@ def planpythontestsuite(env, module, name=None, extra_path=[], py3_compatible=Fa
if pypath:
args.insert(0, "PYTHONPATH=%s" % ":".join(["$PYTHONPATH"] + pypath))
plantestsuite_loadlist(name, env, args)
- if py3_compatible:
+ 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, env, args)