From 76e5d41d6a887e598bef8ec57ddc405c368acc00 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 31 Jul 2010 11:35:31 +0200 Subject: s4:blackbox/newuser: use test specific user names As this test doesn't delete the user accounts at the end, we should use test specific user names. That lowers the chance of conflicts with other tests. metze --- source4/setup/tests/blackbox_newuser.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source4') diff --git a/source4/setup/tests/blackbox_newuser.sh b/source4/setup/tests/blackbox_newuser.sh index 612dedfd98..e74950d25d 100755 --- a/source4/setup/tests/blackbox_newuser.sh +++ b/source4/setup/tests/blackbox_newuser.sh @@ -22,21 +22,21 @@ CONFIG="--configfile=$PREFIX/simple-dc/etc/smb.conf" #two test for creating new user #newuser account is created with cn=Given Name Initials. Surname #newuser1 account is created using cn=username -testit "newuser" $net newuser $CONFIG --given-name="User" --surname="Tester" --initials="T" --profile-path="\\\\myserver\\my\\profile" --script-path="\\\\myserver\\my\\script" --home-directory="\\\\myserver\\my\\homedir" --job-title="Tester" --department="Testing" --company="Samba.org" --description="Description" --mail-address="tester@samba.org" --internet-address="http://samba.org" --telephone-number="001122334455" --physical-delivery-office="101" --home-drive="H:" testuser testp@ssw0Rd -testit "newuser" $net newuser $CONFIG --use-username-as-cn --given-name="User1" --surname="Tester1" --initials="UT1" --profile-path="\\\\myserver\\my\\profile" --script-path="\\\\myserver\\my\\script" --home-directory="\\\\myserver\\my\\homedir" --job-title="Tester" --department="Testing" --company="Samba.org" --description="Description" --mail-address="tester@samba.org" --internet-address="http://samba.org" --telephone-number="001122334455" --physical-delivery-office="101" --home-drive="H:" testuser1 testp@ssw0Rd +testit "newuser" $net newuser $CONFIG --given-name="User" --surname="Tester" --initials="T" --profile-path="\\\\myserver\\my\\profile" --script-path="\\\\myserver\\my\\script" --home-directory="\\\\myserver\\my\\homedir" --job-title="Tester" --department="Testing" --company="Samba.org" --description="Description" --mail-address="tester@samba.org" --internet-address="http://samba.org" --telephone-number="001122334455" --physical-delivery-office="101" --home-drive="H:" NewUser testp@ssw0Rd +testit "newuser" $net newuser $CONFIG --use-username-as-cn --given-name="User1" --surname="Tester1" --initials="UT1" --profile-path="\\\\myserver\\my\\profile" --script-path="\\\\myserver\\my\\script" --home-directory="\\\\myserver\\my\\homedir" --job-title="Tester" --department="Testing" --company="Samba.org" --description="Description" --mail-address="tester@samba.org" --internet-address="http://samba.org" --telephone-number="001122334455" --physical-delivery-office="101" --home-drive="H:" NewUser1 testp@ssw0Rd # check the enable account script -testit "enableaccount" $net enableaccount $CONFIG testuser -testit "enableaccount" $net enableaccount $CONFIG testuser1 +testit "enableaccount" $net enableaccount $CONFIG NewUser +testit "enableaccount" $net enableaccount $CONFIG NewUser1 # check the enable account script -testit "setpassword" $net setpassword $CONFIG testuser --newpassword=testp@ssw0Rd2 -testit "setpassword" $net setpassword $CONFIG testuser1 --newpassword=testp@ssw0Rd2 +testit "setpassword" $net setpassword $CONFIG NewUser --newpassword=testp@ssw0Rd2 +testit "setpassword" $net setpassword $CONFIG NewUser1 --newpassword=testp@ssw0Rd2 # check the setexpiry script -testit "noexpiry" $net setexpiry $CONFIG testuser --noexpiry -testit "noexpiry" $net setexpiry $CONFIG testuser1 --noexpiry -testit "expiry" $net setexpiry $CONFIG testuser --days=7 -testit "expiry" $net setexpiry $CONFIG testuser1 --days=7 +testit "noexpiry" $net setexpiry $CONFIG NewUser --noexpiry +testit "noexpiry" $net setexpiry $CONFIG NewUser1 --noexpiry +testit "expiry" $net setexpiry $CONFIG NewUser --days=7 +testit "expiry" $net setexpiry $CONFIG NewUser1 --days=7 exit $failed -- cgit