diff options
| author | Noel Power <noel.power@suse.com> | 2018-11-02 15:42:11 +0000 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2018-12-10 10:38:20 +0100 |
| commit | 6e46d9770edec2fd821df31bfe92937097ba03c6 (patch) | |
| tree | 958c327f683e1a61d0c2055967f8392547343f60 /python | |
| parent | 7d271450f71a168898482d8c8a0f1f6bbf875804 (diff) | |
| download | samba-6e46d9770edec2fd821df31bfe92937097ba03c6.tar.gz | |
python/samba.tests: Ensure samba-tool is called with correct python ver.
* remove unnecessary 'bin/' part of path as base BlackBox class
will do this anyway and also ensure correct detection that
command needs to have 'PYTHON=blah' addeded
* modify shell script so PYTHON variable if set is prepended
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/tests/blackbox/bug13653.py | 2 | ||||
| -rwxr-xr-x | python/samba/tests/test_pam_winbind_chauthtok.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/python/samba/tests/blackbox/bug13653.py b/python/samba/tests/blackbox/bug13653.py index 6ac23896a6f..6c6b9aece89 100644 --- a/python/samba/tests/blackbox/bug13653.py +++ b/python/samba/tests/blackbox/bug13653.py @@ -175,7 +175,7 @@ class Bug13653Tests(BlackboxTestCase): db_path = "%s/%s/%s/private/sam.ldb" % (scheme, self.prefix, self.env) try: command =\ - "bin/samba-tool user create %s %s -H %s" % ( + "samba-tool user create %s %s -H %s" % ( self.user, password, db_path) self.check_run(command) command =\ diff --git a/python/samba/tests/test_pam_winbind_chauthtok.sh b/python/samba/tests/test_pam_winbind_chauthtok.sh index ca4c2364afe..5887699300a 100755 --- a/python/samba/tests/test_pam_winbind_chauthtok.sh +++ b/python/samba/tests/test_pam_winbind_chauthtok.sh @@ -26,9 +26,9 @@ if [ "$CREATE_USER" = yes ]; then CREATE_USERNAME="$2" CREATE_PASSWORD="$3" shift 3 - $samba_tool user create "$USERNAME" "$PASSWORD" -H "ldap://$CREATE_SERVER" -U "$CREATE_USERNAME%$CREATE_PASSWORD" + $PYTHON $samba_tool user create "$USERNAME" "$PASSWORD" -H "ldap://$CREATE_SERVER" -U "$CREATE_USERNAME%$CREATE_PASSWORD" # reset password policies beside of minimum password age of 0 days - $samba_tool domain passwordsettings set --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=0 --max-pwd-age=default -H "ldap://$CREATE_SERVER" -U "$CREATE_USERNAME%$CREATE_PASSWORD" + $PYTHON $samba_tool domain passwordsettings set --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=0 --max-pwd-age=default -H "ldap://$CREATE_SERVER" -U "$CREATE_USERNAME%$CREATE_PASSWORD" fi PAM_WRAPPER_PATH="$BINDIR/default/third_party/pam_wrapper" @@ -69,9 +69,9 @@ exit_code=$? rm -rf $service_dir if [ "$CREATE_USER" = yes ]; then - $samba_tool user delete "$USERNAME" -H "ldap://$CREATE_SERVER" -U "$CREATE_USERNAME%$CREATE_PASSWORD" + $PYTHON $samba_tool user delete "$USERNAME" -H "ldap://$CREATE_SERVER" -U "$CREATE_USERNAME%$CREATE_PASSWORD" # reset password policies - $samba_tool domain passwordsettings set --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=default --max-pwd-age=default -H "ldap://$CREATE_SERVER" -U "$CREATE_USERNAME%$CREATE_PASSWORD" + $PYTHON $samba_tool domain passwordsettings set --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=default --max-pwd-age=default -H "ldap://$CREATE_SERVER" -U "$CREATE_USERNAME%$CREATE_PASSWORD" fi exit $exit_code |