s4-selftest: Always delete the user at the end of test_passwords.sh
authorAndrew Bartlett <abartlet@samba.org>
Thu, 24 May 2012 03:37:09 +0000 (13:37 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 24 May 2012 07:59:04 +0000 (09:59 +0200)
If this test is run in the "dc" environment (rather than "dc:local") is would not delete the
test user.

Andrew Bartlett

testprogs/blackbox/test_passwords.sh

index c83b46b4fc78075ccdbe07d5006bafccaae6f983..fe8386dd3437fed3d85e67eafcab04e2dafae821 100755 (executable)
@@ -227,7 +227,7 @@ testit_expect_failure "try to change password too quickly (command should not su
 
 testit "reset password policies" $VALGRIND $samba_tool domain passwordsettings $CONFIG set --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=default --max-pwd-age=default || failed=`expr $failed + 1`
 
-testit "del user" $VALGRIND $samba_tool user delete nettestuser -U"$USERNAME%$PASSWORD" -k no $@ || failed=`expr $failed + 1`
+testit "del user" $VALGRIND $samba_tool user delete nettestuser -U"$USERNAME%$PASSWORD" $CONFIG -k no $@ || failed=`expr $failed + 1`
 
 rm -f tmpccfile tmppassfile tmpuserpassfile tmpuserccache tmpkpasswdscript tmpsmbpasswdscript
 exit $failed