From 9fa6635aa80e76d611c73fd6a728ecb59739a0ae Mon Sep 17 00:00:00 2001 From: David Mulder Date: Tue, 13 Feb 2018 08:35:12 -0700 Subject: [PATCH] python: Write py3 bin to correct args location Comands written like this were working: python /home/dmulder/code/samba/source4/scripting/bin/subunitrun Changed to: /usr/bin/python3 /home/dmulder/code/samba/source4/scripting/bin/subunitrun But commands with env args overwrite the wrong arg: CLIENT_IP=127.0.0.11 SOCKET_WRAPPER_DEFAULT_IFACE=11 python /home/dmulder/code/samba/source4/scripting/bin/subunitrun Changed to: /usr/bin/python3 SOCKET_WRAPPER_DEFAULT_IFACE=11 python /home/dmulder/code/samba/source4/scripting/bin/subunitrun And were further mangled in plantestsuite_loadlist() to: /usr/bin/python3 /home/dmulder/code/samba/source4/scripting/bin/subunitrun SOCKET_WRAPPER_DEFAULT_IFACE=11 python /home/dmulder/code/samba/source4/scripting/bin/subunitrun Signed-off-by: David Mulder --- source4/selftest/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 700decd8b9d..8c6f491609a 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -568,7 +568,7 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex name = module plantestsuite_loadlist(name, env, args) if py3_compatible and extra_python is not None: - args[0] = subunitrun3 + args[args.index(subunitrun)] = subunitrun3 plantestsuite_loadlist(name, env, args)