diff --git a/tests/usertools/01/18_userdel_remove_homedir.test b/tests/usertools/01/18_userdel_remove_homedir.test index f7eee9b6..085381d3 100755 --- a/tests/usertools/01/18_userdel_remove_homedir.test +++ b/tests/usertools/01/18_userdel_remove_homedir.test @@ -20,7 +20,16 @@ echo -n "Create user test1 with homedir (useradd --create-home test1)..." useradd --create-home test1 echo "OK" echo -n "Delete user test1 with homedir (userdel --remove test1)..." -userdel --remove test1 +userdel --remove test1 2>tmp/userdel.err + +echo "userdel reported:" +echo "=======================================================================" +cat tmp/userdel.err +echo "=======================================================================" +echo -n "Check the userdel message..." +diff -au 18_userdel_remove_homedir/userdel.err tmp/userdel.err +echo "userdel message OK." +rm -f tmp/userdel.err echo "OK" echo -n "Check the passwd file..." diff --git a/tests/usertools/01/18_userdel_remove_homedir/userdel.err b/tests/usertools/01/18_userdel_remove_homedir/userdel.err new file mode 100644 index 00000000..0b2f1ffc --- /dev/null +++ b/tests/usertools/01/18_userdel_remove_homedir/userdel.err @@ -0,0 +1 @@ +userdel: test1 mail spool (/var/mail/test1) not found diff --git a/tests/usertools/01/21_usermod_change_and_move_homedir.test b/tests/usertools/01/21_usermod_change_and_move_homedir.test index 2db99070..0f269208 100755 --- a/tests/usertools/01/21_usermod_change_and_move_homedir.test +++ b/tests/usertools/01/21_usermod_change_and_move_homedir.test @@ -29,7 +29,17 @@ echo -n "test if the old homedir was removed..." test ! -d /home/test1 echo "OK" echo -n "Delete user test1 (userdel test1)..." -userdel test1 --remove +userdel test1 --remove 2>tmp/userdel.err +echo "OK" + +echo "userdel reported:" +echo "=======================================================================" +cat tmp/userdel.err +echo "=======================================================================" +echo -n "Check the userdel message..." +diff -au 18_userdel_remove_homedir/userdel.err tmp/userdel.err +echo "userdel message OK." +rm -f tmp/userdel.err echo "OK" echo -n "Check the passwd file..." diff --git a/tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err new file mode 100644 index 00000000..5d7b44f1 --- /dev/null +++ b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err @@ -0,0 +1 @@ +userdel: foo mail spool (/var/mail/foo) not found diff --git a/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test b/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test index 64517ecc..a123ccb7 100755 --- a/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test +++ b/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test @@ -28,7 +28,17 @@ ln -s /home/baz /home/foo/baz chown -R foo:foo /home/foo /home/bar /home/baz echo -n "Delete user foo (userdel -r foo)..." -userdel -r foo +userdel -r foo 2>tmp/userdel.err +echo "OK" + +echo "userdel reported:" +echo "=======================================================================" +cat tmp/userdel.err +echo "=======================================================================" +echo -n "Check the userdel message..." +diff -au data/userdel.err tmp/userdel.err +echo "userdel message OK." +rm -f tmp/userdel.err echo "OK" echo -n "Check the passwd file..."