2 files changed, 22 insertions, 0 deletions

diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile
index ccb81c090445..bb2f0d7c747e 100644
--- a/libexec/nuageinit/tests/Makefile
+++ b/libexec/nuageinit/tests/Makefile
@@ -1,10 +1,17 @@
 PACKAGE=	tests
+.PATH:		${SRCTOP}/usr.sbin/pw/tests
+
+BINDIR=		${TESTSDIR}
+
+PROGS=		crypt
+LIBADD=		crypt
 
 ATF_TESTS_SH=	nuage utils nuageinit
 
 ${PACKAGE}FILES+=	addgroup.lua
 ${PACKAGE}FILES+=	addsshkey.lua
 ${PACKAGE}FILES+=	adduser.lua
+${PACKAGE}FILES+=	adduser_passwd.lua
 ${PACKAGE}FILES+=	dirname.lua
 ${PACKAGE}FILES+=	err.lua
 ${PACKAGE}FILES+=	sethostname.lua
diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh
index 293a0a4a9a83..a5451561202f 100644
--- a/libexec/nuageinit/tests/nuage.sh
+++ b/libexec/nuageinit/tests/nuage.sh
@@ -9,6 +9,7 @@ export NUAGE_FAKE_ROOTDIR="$PWD"
 atf_test_case sethostname
 atf_test_case addsshkey
 atf_test_case adduser
+atf_test_case adduser_passwd
 atf_test_case addgroup
 
 sethostname_body()
@@ -48,6 +49,19 @@ adduser_body()
 	atf_check -o inline:"impossible_username::1001:1001::0:0:impossible_username User:/home/impossible_username:/bin/sh\n" grep impossible_username etc/master.passwd
 }
 
+adduser_passwd_body()
+{
+	mkdir etc
+	printf "root:*:0:0::0:0:Charlie &:/root:/bin/sh\n" > etc/master.passwd
+	pwd_mkdb -d etc etc/master.passwd
+	printf "wheel:*:0:root\n" > etc/group
+	atf_check /usr/libexec/flua $(atf_get_srcdir)/adduser_passwd.lua
+	test -d home/foo || atf_fail "home not created"
+	passhash=`awk -F ':' '/^foo:/ {print $2}' etc/master.passwd`
+	atf_check -s exit:0 -o inline:$passhash \
+		$(atf_get_srcdir)/crypt $passhash "bar"
+}
+
 addgroup_body()
 {
 	mkdir etc
@@ -61,5 +75,6 @@ atf_init_test_cases()
 	atf_add_test_case sethostname
 	atf_add_test_case addsshkey
 	atf_add_test_case adduser
+	atf_add_test_case adduser_passwd
 	atf_add_test_case addgroup
 }