From 65269966d56cf682b53f90bc5c9b4ce9ddbc2216 Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Fri, 22 May 2009 11:46:57 +0000
Subject: [PATCH] Make sure the process started by su is killed. Avoid messages
 on, stderr. Make sure the process started by su is actually started when
 userdel is run.

---
 tests/usertools/55_userdel_busy_user/userdel.test | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/usertools/55_userdel_busy_user/userdel.test b/tests/usertools/55_userdel_busy_user/userdel.test
index a62a8015..994e4674 100755
--- a/tests/usertools/55_userdel_busy_user/userdel.test
+++ b/tests/usertools/55_userdel_busy_user/userdel.test
@@ -12,14 +12,17 @@ log_start "$0" "userdel accepts when the user is not is shadow"
 save_config
 
 # restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
+trap 'log_status "$0" "FAILURE"; restore_config; kill %1' 0
 
 change_config
 
 echo -n "Create a process for foo (su -l foo -c \"sleep 10\")..."
-su -l foo -c "sleep 10" &
+su -l foo -c "sleep 10" 2>/dev/null &
 echo "OK"
 
+# Make sure su was started.
+sleep 1
+
 echo -n "Delete user foo (userdel foo)..."
 userdel foo 2>tmp/userdel.err && exit 1 || {
 	status=$?