diff options
Diffstat (limited to 'source4/setup/tests')
| -rwxr-xr-x | source4/setup/tests/blackbox_group.sh | 78 | ||||
| -rwxr-xr-x | source4/setup/tests/blackbox_newuser.sh | 22 | ||||
| -rwxr-xr-x | source4/setup/tests/blackbox_setpassword.sh | 10 | ||||
| -rwxr-xr-x | source4/setup/tests/blackbox_spn.sh | 24 |
4 files changed, 67 insertions, 67 deletions
diff --git a/source4/setup/tests/blackbox_group.sh b/source4/setup/tests/blackbox_group.sh index adffad1cc7..451ae9d641 100755 --- a/source4/setup/tests/blackbox_group.sh +++ b/source4/setup/tests/blackbox_group.sh @@ -15,60 +15,60 @@ shift 1 rm -rf $PREFIX/simple-dc testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc -net="./bin/net" +samba_tool="./bin/samba-tool" CONFIG="--configfile=$PREFIX/simple-dc/etc/smb.conf" #creation of two test subjects -testit "newuser" $net newuser $CONFIG --given-name="User" --surname="Tester" --initial="UT" testuser testp@ssw0Rd -testit "newuser" $net newuser $CONFIG --given-name="User1" --surname="Tester" --initial="UT" testuser1 testp@ssw0Rd +testit "newuser" $samba_tool newuser $CONFIG --given-name="User" --surname="Tester" --initial="UT" testuser testp@ssw0Rd +testit "newuser" $samba_tool newuser $CONFIG --given-name="User1" --surname="Tester" --initial="UT" testuser1 testp@ssw0Rd #test creation of six different groups -testit "group add" $net group add $CONFIG --group-scope='Domain' --group-type='Security' --description='DomainSecurityGroup' --mail-address='dsg@samba.org' --notes='Notes' dsg -testit "group add" $net group add $CONFIG --group-scope='Global' --group-type='Security' --description='GlobalSecurityGroup' --mail-address='gsg@samba.org' --notes='Notes' gsg -testit "group add" $net group add $CONFIG --group-scope='Universal' --group-type='Security' --description='UniversalSecurityGroup' --mail-address='usg@samba.org' --notes='Notes' usg -testit "group add" $net group add $CONFIG --group-scope='Domain' --group-type='Distribution' --description='DomainDistributionGroup' --mail-address='ddg@samba.org' --notes='Notes' ddg -testit "group add" $net group add $CONFIG --group-scope='Global' --group-type='Distribution' --description='GlobalDistributionGroup' --mail-address='gdg@samba.org' --notes='Notes' gdg -testit "group add" $net group add $CONFIG --group-scope='Universal' --group-type='Distribution' --description='UniversalDistributionGroup' --mail-address='udg@samba.org' --notes='Notes' udg +testit "group add" $samba_tool group add $CONFIG --group-scope='Domain' --group-type='Security' --description='DomainSecurityGroup' --mail-address='dsg@samba.org' --notes='Notes' dsg +testit "group add" $samba_tool group add $CONFIG --group-scope='Global' --group-type='Security' --description='GlobalSecurityGroup' --mail-address='gsg@samba.org' --notes='Notes' gsg +testit "group add" $samba_tool group add $CONFIG --group-scope='Universal' --group-type='Security' --description='UniversalSecurityGroup' --mail-address='usg@samba.org' --notes='Notes' usg +testit "group add" $samba_tool group add $CONFIG --group-scope='Domain' --group-type='Distribution' --description='DomainDistributionGroup' --mail-address='ddg@samba.org' --notes='Notes' ddg +testit "group add" $samba_tool group add $CONFIG --group-scope='Global' --group-type='Distribution' --description='GlobalDistributionGroup' --mail-address='gdg@samba.org' --notes='Notes' gdg +testit "group add" $samba_tool group add $CONFIG --group-scope='Universal' --group-type='Distribution' --description='UniversalDistributionGroup' --mail-address='udg@samba.org' --notes='Notes' udg #test adding test users to all groups by their username -testit "group addmembers" $net group addmembers $CONFIG dsg newuser,newuser1 -testit "group addmembers" $net group addmembers $CONFIG gsg newuser,newuser1 -testit "group addmembers" $net group addmembers $CONFIG usg newuser,newuser1 -testit "group addmembers" $net group addmembers $CONFIG ddg newuser,newuser1 -testit "group addmembers" $net group addmembers $CONFIG gdg newuser,newuser1 -testit "group addmembers" $net group addmembers $CONFIG udg newuser,newuser1 +testit "group addmembers" $samba_tool group addmembers $CONFIG dsg newuser,newuser1 +testit "group addmembers" $samba_tool group addmembers $CONFIG gsg newuser,newuser1 +testit "group addmembers" $samba_tool group addmembers $CONFIG usg newuser,newuser1 +testit "group addmembers" $samba_tool group addmembers $CONFIG ddg newuser,newuser1 +testit "group addmembers" $samba_tool group addmembers $CONFIG gdg newuser,newuser1 +testit "group addmembers" $samba_tool group addmembers $CONFIG udg newuser,newuser1 #test removing test users from all groups by their username -testit "group removemembers" $net group removemembers $CONFIG dsg newuser,newuser1 -testit "group removemembers" $net group removemembers $CONFIG gsg newuser,newuser1 -testit "group removemembers" $net group removemembers $CONFIG usg newuser,newuser1 -testit "group removemembers" $net group removemembers $CONFIG ddg newuser,newuser1 -testit "group removemembers" $net group removemembers $CONFIG gdg newuser,newuser1 -testit "group removemembers" $net group removemembers $CONFIG udg newuser,newuser1 +testit "group removemembers" $samba_tool group removemembers $CONFIG dsg newuser,newuser1 +testit "group removemembers" $samba_tool group removemembers $CONFIG gsg newuser,newuser1 +testit "group removemembers" $samba_tool group removemembers $CONFIG usg newuser,newuser1 +testit "group removemembers" $samba_tool group removemembers $CONFIG ddg newuser,newuser1 +testit "group removemembers" $samba_tool group removemembers $CONFIG gdg newuser,newuser1 +testit "group removemembers" $samba_tool group removemembers $CONFIG udg newuser,newuser1 #test adding test users to all groups by their cn -#testit "group addmembers" $net group addmembers $CONFIG dsg "User UT. Tester,User1 UT. Tester" -#testit "group addmembers" $net group addmembers $CONFIG gsg "User UT. Tester,User1 UT. Tester" -#testit "group addmembers" $net group addmembers $CONFIG usg "User UT. Tester,User1 UT. Tester" -#testit "group addmembers" $net group addmembers $CONFIG ddg "User UT. Tester,User1 UT. Tester" -#testit "group addmembers" $net group addmembers $CONFIG gdg "User UT. Tester,User1 UT. Tester" -#testit "group addmembers" $net group addmembers $CONFIG udg "User UT. Tester,User1 UT. Tester" +#testit "group addmembers" $samba_tool group addmembers $CONFIG dsg "User UT. Tester,User1 UT. Tester" +#testit "group addmembers" $samba_tool group addmembers $CONFIG gsg "User UT. Tester,User1 UT. Tester" +#testit "group addmembers" $samba_tool group addmembers $CONFIG usg "User UT. Tester,User1 UT. Tester" +#testit "group addmembers" $samba_tool group addmembers $CONFIG ddg "User UT. Tester,User1 UT. Tester" +#testit "group addmembers" $samba_tool group addmembers $CONFIG gdg "User UT. Tester,User1 UT. Tester" +#testit "group addmembers" $samba_tool group addmembers $CONFIG udg "User UT. Tester,User1 UT. Tester" #test removing test users from all groups by their cn -#testit "group removemembers" $net group removemembers $CONFIG dsg "User UT. Tester,User1 UT. Tester" -#testit "group removemembers" $net group removemembers $CONFIG gsg "User UT. Tester,User1 UT. Tester" -#testit "group removemembers" $net group removemembers $CONFIG usg "User UT. Tester,User1 UT. Tester" -#testit "group removemembers" $net group removemembers $CONFIG ddg "User UT. Tester,User1 UT. Tester" -#testit "group removemembers" $net group removemembers $CONFIG gdg "User UT. Tester,User1 UT. Tester" -#testit "group removemembers" $net group removemembers $CONFIG ugg "User UT. Tester,User1 UT. Tester" +#testit "group removemembers" $samba_tool group removemembers $CONFIG dsg "User UT. Tester,User1 UT. Tester" +#testit "group removemembers" $samba_tool group removemembers $CONFIG gsg "User UT. Tester,User1 UT. Tester" +#testit "group removemembers" $samba_tool group removemembers $CONFIG usg "User UT. Tester,User1 UT. Tester" +#testit "group removemembers" $samba_tool group removemembers $CONFIG ddg "User UT. Tester,User1 UT. Tester" +#testit "group removemembers" $samba_tool group removemembers $CONFIG gdg "User UT. Tester,User1 UT. Tester" +#testit "group removemembers" $samba_tool group removemembers $CONFIG ugg "User UT. Tester,User1 UT. Tester" #test deletion of the groups -testit "group delete" $net group delete $CONFIG dsg -testit "group delete" $net group delete $CONFIG gsg -testit "group delete" $net group delete $CONFIG usg -testit "group delete" $net group delete $CONFIG ddg -testit "group delete" $net group delete $CONFIG gdg -testit "group delete" $net group delete $CONFIG udg +testit "group delete" $samba_tool group delete $CONFIG dsg +testit "group delete" $samba_tool group delete $CONFIG gsg +testit "group delete" $samba_tool group delete $CONFIG usg +testit "group delete" $samba_tool group delete $CONFIG ddg +testit "group delete" $samba_tool group delete $CONFIG gdg +testit "group delete" $samba_tool group delete $CONFIG udg exit $failed diff --git a/source4/setup/tests/blackbox_newuser.sh b/source4/setup/tests/blackbox_newuser.sh index e74950d25d..aa45964f00 100755 --- a/source4/setup/tests/blackbox_newuser.sh +++ b/source4/setup/tests/blackbox_newuser.sh @@ -15,28 +15,28 @@ shift 1 rm -rf $PREFIX/simple-dc testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc -net="./bin/net" +samba_tool="./bin/samba-tool" 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:" 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 +testit "newuser" $samba_tool 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" $samba_tool 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 NewUser -testit "enableaccount" $net enableaccount $CONFIG NewUser1 +testit "enableaccount" $samba_tool enableaccount $CONFIG NewUser +testit "enableaccount" $samba_tool enableaccount $CONFIG NewUser1 # check the enable account script -testit "setpassword" $net setpassword $CONFIG NewUser --newpassword=testp@ssw0Rd2 -testit "setpassword" $net setpassword $CONFIG NewUser1 --newpassword=testp@ssw0Rd2 +testit "setpassword" $samba_tool setpassword $CONFIG NewUser --newpassword=testp@ssw0Rd2 +testit "setpassword" $samba_tool setpassword $CONFIG NewUser1 --newpassword=testp@ssw0Rd2 # check the setexpiry script -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 +testit "noexpiry" $samba_tool setexpiry $CONFIG NewUser --noexpiry +testit "noexpiry" $samba_tool setexpiry $CONFIG NewUser1 --noexpiry +testit "expiry" $samba_tool setexpiry $CONFIG NewUser --days=7 +testit "expiry" $samba_tool setexpiry $CONFIG NewUser1 --days=7 exit $failed diff --git a/source4/setup/tests/blackbox_setpassword.sh b/source4/setup/tests/blackbox_setpassword.sh index da81553179..6c405674c1 100755 --- a/source4/setup/tests/blackbox_setpassword.sh +++ b/source4/setup/tests/blackbox_setpassword.sh @@ -12,17 +12,17 @@ shift 1 . `dirname $0`/../../../testprogs/blackbox/subunit.sh -net="./bin/net" +samba_tool="./bin/samba-tool" rm -rf $PREFIX/simple-dc testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc -testit "newuser" $net newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testp@ssw0Rd +testit "newuser" $samba_tool newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testp@ssw0Rd -testit "setpassword" $net setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testp@ssw0Rd +testit "setpassword" $samba_tool setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testp@ssw0Rd -testit "setpassword" $net setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testp@ssw0Rd --must-change-at-next-login +testit "setpassword" $samba_tool setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testp@ssw0Rd --must-change-at-next-login -testit "pwsettings" $net pwsettings --quiet set --configfile=$PREFIX/simple-dc/etc/smb.conf --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=default --max-pwd-age=default +testit "pwsettings" $samba_tool pwsettings --quiet set --configfile=$PREFIX/simple-dc/etc/smb.conf --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=default --max-pwd-age=default exit $failed diff --git a/source4/setup/tests/blackbox_spn.sh b/source4/setup/tests/blackbox_spn.sh index f2fd8acfbb..515a06e437 100755 --- a/source4/setup/tests/blackbox_spn.sh +++ b/source4/setup/tests/blackbox_spn.sh @@ -13,21 +13,21 @@ shift 1 . `dirname $0`/../../../testprogs/blackbox/subunit.sh -net="./bin/net" +samba_tool="./bin/samba-tool" CONFIG="--configfile=$PREFIX/etc/smb.conf" #creation of two test subjects -testit "addspn" $net spn add FOO/bar Administrator $CONFIG -testit "delspn" $net spn delete FOO/bar $CONFIG -testit "readdspn" $net spn add FOO/bar Administrator $CONFIG -testit_expect_failure "failexistingspn" $net spn add FOO/bar Guest $CONFIG -testit "existingspnforce" $net spn add --force FOO/bar Guest $CONFIG -testit_expect_failure "faildelspnnotgooduser" $net spn delete FOO/bar krbtgt $CONFIG -testit_expect_failure "faildelspnmoreoneuser" $net spn delete FOO/bar $CONFIG -testit "deluserspn" $net spn delete FOO/bar Guest $CONFIG -testit "dellastuserspn" $net spn delete FOO/bar $CONFIG -testit_expect_failure "faildelspn" $net spn delete FOO/bar $CONFIG -testit_expect_failure "failaddspn" $net spn add FOO/bar nonexistinguser $CONFIG +testit "addspn" $samba_tool spn add FOO/bar Administrator $CONFIG +testit "delspn" $samba_tool spn delete FOO/bar $CONFIG +testit "readdspn" $samba_tool spn add FOO/bar Administrator $CONFIG +testit_expect_failure "failexistingspn" $samba_tool spn add FOO/bar Guest $CONFIG +testit "existingspnforce" $samba_tool spn add --force FOO/bar Guest $CONFIG +testit_expect_failure "faildelspnnotgooduser" $samba_tool spn delete FOO/bar krbtgt $CONFIG +testit_expect_failure "faildelspnmoreoneuser" $samba_tool spn delete FOO/bar $CONFIG +testit "deluserspn" $samba_tool spn delete FOO/bar Guest $CONFIG +testit "dellastuserspn" $samba_tool spn delete FOO/bar $CONFIG +testit_expect_failure "faildelspn" $samba_tool spn delete FOO/bar $CONFIG +testit_expect_failure "failaddspn" $samba_tool spn add FOO/bar nonexistinguser $CONFIG exit $failed |