Index: head/usr.sbin/pw/tests/Makefile
===================================================================
--- head/usr.sbin/pw/tests/Makefile	(revision 275656)
+++ head/usr.sbin/pw/tests/Makefile	(revision 275657)
@@ -1,25 +1,27 @@
 # $FreeBSD$
 
 TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.sbin/useradd
 .PATH: ${TESTSRC}
 
 TESTSDIR=	${TESTSBASE}/usr.sbin/pw
 
-ATF_TESTS_SH=	pw_etcdir pw_lock pw_groupmod pw_useradd pw_userdel
+ATF_TESTS_SH=	pw_etcdir pw_lock pw_groupdel pw_groupmod pw_useradd pw_userdel pw_usermod
 
+TEST_METADATA.pw_groupdel+=	required_user="root"
 TEST_METADATA.pw_groupmod+=	required_user="root"
 TEST_METADATA.pw_useradd+=	required_user="root"
 TEST_METADATA.pw_userdel+=	required_user="root"
+TEST_METADATA.pw_usermod+=	required_user="root"
 
 FILES=		group helper_functions.shin master.passwd
 FILESDIR=       ${TESTSDIR}
 
 ATF_TESTS_SH+=	pw_test
 # - user{add,del} does not exist on FreeBSD; use pw user{add,del} instead
 # - The command passes on FreeBSD
 ATF_TESTS_SH_SED_pw_test=	-e 's/useradd /pw useradd /'
 ATF_TESTS_SH_SED_pw_test+=	-e 's/userdel /pw userdel /'
 ATF_TESTS_SH_SED_pw_test+=	-e '/atf_expect_fail "PR bin\/39546"/d'
 ATF_TESTS_SH_SRC_pw_test=	t_useradd.sh
 
 .include <bsd.test.mk>
Index: head/usr.sbin/pw/tests/pw_usermod.sh
===================================================================
--- head/usr.sbin/pw/tests/pw_usermod.sh	(nonexistent)
+++ head/usr.sbin/pw/tests/pw_usermod.sh	(revision 275657)
@@ -0,0 +1,56 @@
+# $FreeBSD$
+
+# Import helper functions
+. $(atf_get_srcdir)/helper_functions.shin
+
+# Test modifying a user
+atf_test_case user_mod
+user_mod_body() {
+	populate_etc_skel
+
+	atf_check -s exit:67 -e match:"no such user" ${PW} usermod test
+	atf_check -s exit:0 ${PW} useradd test
+	atf_check -s exit:0 ${PW} usermod test
+	atf_check -s exit:0 -o match:"^test:.*" \
+		grep "^test:.*" $HOME/master.passwd
+}
+
+# Test modifying a user with comments
+atf_test_case user_mod_comments
+user_mod_comments_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd test -c "Test User,home,123,456"
+	atf_check -s exit:0 ${PW} usermod test -c "Test User,work,123,456"
+	atf_check -s exit:0 -o match:"^test:.*:Test User,work,123,456:" \
+		grep "^test:.*:Test User,work,123,456:" $HOME/master.passwd
+}
+
+# Test modifying a user with invalid comments
+atf_test_case user_mod_comments_invalid
+user_mod_comments_invalid_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd test
+	atf_check -s exit:65 -e match:"invalid character" \
+		${PW} usermod test -c "Test User,work,123:456,456"
+	atf_check -s exit:1 -o empty \
+		grep "^test:.*:Test User,work,123:456,456:" $HOME/master.passwd
+}
+
+# Test modifying a user name with -l
+atf_test_case user_mod_name
+user_mod_name_body() {
+	populate_etc_skel
+
+	atf_check -s exit:0 ${PW} useradd foo
+	atf_check -s exit:0 ${PW} usermod foo -l "bar"
+	atf_check -s exit:0 -o match:"^bar:.*" \
+		grep "^bar:.*" $HOME/master.passwd
+}
+atf_init_test_cases() {
+	atf_add_test_case user_mod
+	atf_add_test_case user_mod_comments
+	atf_add_test_case user_mod_comments_invalid 
+	atf_add_test_case user_mod_name
+}

Property changes on: head/usr.sbin/pw/tests/pw_usermod.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property