From d8684349390a13df675873400556f140ba3d64b3 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Fri, 22 May 2009 11:44:21 +0000 Subject: [PATCH] Updated traps. Avoid removal of files not created by the testsuite --- tests/usertools/09_userdel_del_homedir/userdel.test | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/usertools/09_userdel_del_homedir/userdel.test b/tests/usertools/09_userdel_del_homedir/userdel.test index 0ae4e4bd..5d2a7aa3 100755 --- a/tests/usertools/09_userdel_del_homedir/userdel.test +++ b/tests/usertools/09_userdel_del_homedir/userdel.test @@ -12,13 +12,15 @@ log_start "$0" "userdel can delete the user's home directory" save_config # restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config; rm -rf /var/mail/foo /home/foo' 0 +trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config mkdir /home/foo +trap 'log_status "$0" "FAILURE"; restore_config; rm -rf /home/foo' 0 echo toto > /home/foo/toto touch /var/mail/foo +trap 'log_status "$0" "FAILURE"; restore_config; rm -rf /var/mail/foo /home/foo' 0 chown -R foo:foo /var/mail/foo /home/foo echo -n "Delete user foo (userdel -r foo)..."