From 3472bee15a8fb23804f30beed3a29ef42806f430 Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Fri, 27 Aug 2010 17:57:42 +0000
Subject: [PATCH] Behavior of usermod was improved regarding (re)moving the old
 homedir.

---
 .../data/home_ls-a                            |  3 --
 .../data/usermod.err                          |  1 +
 .../usermod.test                              | 28 +++++++++++++------
 3 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 tests/usertools/12_usermod_move_homedir_dev_null/data/home_ls-a
 create mode 100644 tests/usertools/12_usermod_move_homedir_dev_null/data/usermod.err

diff --git a/tests/usertools/12_usermod_move_homedir_dev_null/data/home_ls-a b/tests/usertools/12_usermod_move_homedir_dev_null/data/home_ls-a
deleted file mode 100644
index 89bbbd9a..00000000
--- a/tests/usertools/12_usermod_move_homedir_dev_null/data/home_ls-a
+++ /dev/null
@@ -1,3 +0,0 @@
--rw-r--r-- foo:foo `/home/foo2/toto'
-drwxr-xr-x foo:foo `/home/foo2/.'
-drwxr-xr-x root:root `/home/foo2/..'
diff --git a/tests/usertools/12_usermod_move_homedir_dev_null/data/usermod.err b/tests/usertools/12_usermod_move_homedir_dev_null/data/usermod.err
new file mode 100644
index 00000000..f02fc5a2
--- /dev/null
+++ b/tests/usertools/12_usermod_move_homedir_dev_null/data/usermod.err
@@ -0,0 +1 @@
+usermod: The previous home directory (/dev/null) was not a directory. It is not removed and no home directories are created.
diff --git a/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test b/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test
index b17b3098..15a0198b 100755
--- a/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test
+++ b/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test
@@ -18,7 +18,24 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 change_config
 
 echo -n "Change the user's home directory (usermod -m -d /home/foo2 foo)..."
-usermod -m -d /home/foo2 foo
+usermod -m -d /home/foo2 foo 2>tmp/usermod.err && exit 1 || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "12"
+echo "OK"
+
+echo "usermod reported:"
+echo "======================================================================="
+cat tmp/usermod.err
+echo "======================================================================="
+echo -n "Check that there were a failure message..."
+diff -au data/usermod.err tmp/usermod.err
+echo "error message OK."
+rm -f tmp/usermod.err
+
 echo "OK"
 
 echo -n "Check the passwd file..."
@@ -37,15 +54,8 @@ echo -n "Make sure /dev/null was not removed..."
 test -c /dev/null
 echo "OK"
 echo -n "Make sure the user's home directory was not removed..."
-test -d /home/foo2
+test ! -e /home/foo2
 echo "OK"
-echo -n "Check content of /home/foo2/..."
-stat --printf "%A %U:%G %N\n" /home/foo2/* /home/foo2/.* 2>/dev/null | sort > tmp/home_ls-a
-diff -rauN data/home_ls-a tmp/home_ls-a
-echo "OK"
-echo -n "Remove the new home directory..."
-rm -rf /home/foo2
-echo "done"
 
 log_status "$0" "SUCCESS"
 restore_config