[Pkg-shadow-commits] r2990 - debian/trunk/tests/usertools/55_userdel_busy_user

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-05-22 11:46:57 +0000 (Fri, 22 May 2009)
New Revision: 2990

Modified:
   debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test
Log:
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.


Modified: debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test
===================================================================
--- debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test	2009-05-22 11:44:54 UTC (rev 2989)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test	2009-05-22 11:46:57 UTC (rev 2990)
@@ -12,14 +12,17 @@
 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=$?