diff options
author | brd <brd@FreeBSD.org> | 2014-11-17 15:44:00 +0000 |
---|---|---|
committer | brd <brd@FreeBSD.org> | 2014-11-17 15:44:00 +0000 |
commit | 3a05a8b85c5bfd13e4bcb668a9b52d694cc748b2 (patch) | |
tree | 3d82899551f63ced068726fb688591c3ac9efd79 /usr.sbin | |
parent | 2cfe78eed8ed3cafea0a939189cd2cbc4d219d3f (diff) | |
download | FreeBSD-src-3a05a8b85c5bfd13e4bcb668a9b52d694cc748b2.zip FreeBSD-src-3a05a8b85c5bfd13e4bcb668a9b52d694cc748b2.tar.gz |
Clean up some language
Reviewed by: will
Diffstat (limited to 'usr.sbin')
-rwxr-xr-x | usr.sbin/pw/tests/pw_delete.sh | 22 | ||||
-rwxr-xr-x | usr.sbin/pw/tests/pw_etcdir.sh | 14 |
2 files changed, 18 insertions, 18 deletions
diff --git a/usr.sbin/pw/tests/pw_delete.sh b/usr.sbin/pw/tests/pw_delete.sh index 0e97939..02a9ade 100755 --- a/usr.sbin/pw/tests/pw_delete.sh +++ b/usr.sbin/pw/tests/pw_delete.sh @@ -15,33 +15,33 @@ rmuser_seperate_group_body() { pw -V ${HOME} useradd test || atf_fail "Creating test user" pw -V ${HOME} groupmod test -M 'test,root' || \ atf_fail "Modifying the group" - pw -V ${HOME} userdel test || atf_fail "delete the user" + pw -V ${HOME} userdel test || atf_fail "Delete the test user" } -atf_test_case group_do_not_delete_wheel_if_group_unkown -group_do_not_delete_wheel_if_group_unkown_head() { - atf_set "descr" "Make sure we do not consider as gid 0 an unknown group" +atf_test_case group_do_not_delete_wheel_if_group_unknown +group_do_not_delete_wheel_if_group_unknown_head() { + atf_set "descr" "Make sure we do not consider gid 0 an unknown group" } -group_do_not_delete_wheel_if_group_unkown_body() { +group_do_not_delete_wheel_if_group_unknown_body() { populate_etc_skel atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel atf_check -e inline:"pw: -g expects a number\n" -s exit:64 -x pw -V ${HOME} groupdel -g I_do_not_exist atf_check -s exit:0 -o inline:"wheel:*:0:root\n" -x pw -V ${HOME} groupshow wheel } -atf_test_case user_do_not_try_to_delete_root_if_user_unkown -user_do_not_try_to_delete_root_if_user_unkown_head() { - atf_set "descr" "Make sure not to try to remove root if deleteing an unknown user" +atf_test_case user_do_not_try_to_delete_root_if_user_unknown +user_do_not_try_to_delete_root_if_user_unknown_head() { + atf_set "descr" "Make sure not to try to remove root if deleting an unknown user" } -user_do_not_try_to_delete_root_if_user_unkown_body() { +user_do_not_try_to_delete_root_if_user_unknown_body() { populate_etc_skel atf_check -e inline:"pw: -u expects a number\n" -s exit:64 -x pw -V ${HOME} userdel -u plop } atf_init_test_cases() { atf_add_test_case rmuser_seperate_group - atf_add_test_case group_do_not_delete_wheel_if_group_unkown - atf_add_test_case user_do_not_try_to_delete_root_if_user_unkown + atf_add_test_case group_do_not_delete_wheel_if_group_unknown + atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown } diff --git a/usr.sbin/pw/tests/pw_etcdir.sh b/usr.sbin/pw/tests/pw_etcdir.sh index edb97fe..b237789 100755 --- a/usr.sbin/pw/tests/pw_etcdir.sh +++ b/usr.sbin/pw/tests/pw_etcdir.sh @@ -1,18 +1,18 @@ # $FreeBSD$ -# When provide -V dir, dir must exists -atf_test_case etcdir_must_exists -etcdir_must_exists_head() { - atf_set "descr" "When provide -V dir, dir must exists" +# When the '-V directory' option is provided, the directory must exist +atf_test_case etcdir_must_exist +etcdir_must_exist_head() { + atf_set "descr" "When the '-V directory' option is provided, the directory must exist" } -etcdir_must_exists_body() { - local fakedir="/this_directory_does_not_exists" +etcdir_must_exist_body() { + local fakedir="/this_directory_does_not_exist" atf_check -e inline:"pw: no such directory \`$fakedir'\n" \ -s exit:72 -x pw -V ${fakedir} usershow root } atf_init_test_cases() { - atf_add_test_case etcdir_must_exists + atf_add_test_case etcdir_must_exist } |