Date: Mon, 17 Nov 2014 15:44:00 +0000 (UTC) From: Brad Davis <brd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274632 - head/usr.sbin/pw/tests Message-ID: <201411171544.sAHFi0aR025006@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brd (doc committer) Date: Mon Nov 17 15:44:00 2014 New Revision: 274632 URL: https://svnweb.freebsd.org/changeset/base/274632 Log: Clean up some language Reviewed by: will Modified: head/usr.sbin/pw/tests/pw_delete.sh head/usr.sbin/pw/tests/pw_etcdir.sh Modified: head/usr.sbin/pw/tests/pw_delete.sh ============================================================================== --- head/usr.sbin/pw/tests/pw_delete.sh Mon Nov 17 15:19:57 2014 (r274631) +++ head/usr.sbin/pw/tests/pw_delete.sh Mon Nov 17 15:44:00 2014 (r274632) @@ -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 } Modified: head/usr.sbin/pw/tests/pw_etcdir.sh ============================================================================== --- head/usr.sbin/pw/tests/pw_etcdir.sh Mon Nov 17 15:19:57 2014 (r274631) +++ head/usr.sbin/pw/tests/pw_etcdir.sh Mon Nov 17 15:44:00 2014 (r274632) @@ -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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411171544.sAHFi0aR025006>