diff options
| author | Noel Power <noel.power@suse.com> | 2018-10-10 17:14:39 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-11-14 05:07:16 +0100 |
| commit | 0ef6e3da4b6dd8e36ced3ad344f9981901aaa2f2 (patch) | |
| tree | 3fafd77750a4fe414ab3bff8a7dd56270b2f4319 /testprogs/blackbox/test_chgdcpass.sh | |
| parent | 5b4c664856602e411bf2897e44e5453c7831035f (diff) | |
| download | samba-0ef6e3da4b6dd8e36ced3ad344f9981901aaa2f2.tar.gz | |
testprogs/blackbox: PY3 bulk change for python scripts use correct python
Change all instance where python scripts are called so that the
correct python version as specified by $PYTHON is used
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'testprogs/blackbox/test_chgdcpass.sh')
| -rwxr-xr-x | testprogs/blackbox/test_chgdcpass.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testprogs/blackbox/test_chgdcpass.sh b/testprogs/blackbox/test_chgdcpass.sh index 6ac4c882e32..66853b364f2 100755 --- a/testprogs/blackbox/test_chgdcpass.sh +++ b/testprogs/blackbox/test_chgdcpass.sh @@ -45,8 +45,8 @@ test_drs() { shift shift echo "test: $name" - echo $VALGRIND $samba4bindir/samba-tool drs $function $SERVER -k yes $@ - $VALGRIND $samba4bindir/samba-tool drs $function $SERVER -k yes $@ + echo $VALGRIND $PYTHON $samba4bindir/samba-tool drs $function $SERVER -k yes $@ + $VALGRIND $PYTHON $samba4bindir/samba-tool drs $function $SERVER -k yes $@ status=$? if [ x$status = x0 ]; then echo "success: $name" @@ -77,7 +77,7 @@ test_drs bind "Test drs bind with with kerberos ccache" || failed=`expr $failed #check that drs options works before we change the password (prime the ccache) test_drs options "Test drs options with with kerberos ccache" || failed=`expr $failed + 1` -testit "change dc password" $samba4srcdir/scripting/devel/chgtdcpass -s $PROVDIR/etc/smb.conf || failed=`expr $failed + 1` +testit "change dc password" $PYTHON $samba4srcdir/scripting/devel/chgtdcpass -s $PROVDIR/etc/smb.conf || failed=`expr $failed + 1` #This is important because it shows that the old ticket remains valid (as it must) for incoming connections after the DC password is changed test_smbclient "Test login with kerberos ccache after password change" 'ls' "$unc" -k yes || failed=`expr $failed + 1` @@ -88,7 +88,7 @@ test_drs bind "Test drs bind with new password" || failed=`expr $failed + 1` #check that drs options works after we change the password test_drs options "Test drs options with new password" || failed=`expr $failed + 1` -testit "change dc password (2nd time)" $samba4srcdir/scripting/devel/chgtdcpass -s $PROVDIR/etc/smb.conf || failed=`expr $failed + 1` +testit "change dc password (2nd time)" $PYTHON $samba4srcdir/scripting/devel/chgtdcpass -s $PROVDIR/etc/smb.conf || failed=`expr $failed + 1` # This is important because it shows that the old ticket is discarded if the server rejects it (as it must) after the password was changed twice in succession. # This also ensures we handle the case where the domain is re-provisioned etc |