From edc2bc5556022bb096008f1a5fc0fbe542136967 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 16 Oct 2011 14:37:49 +0000 Subject: [PATCH] * Fix typos in comments. * Remove generated directory. --- .../userdel/01_userdel_gshadow_rename_failure/userdel.test | 2 +- .../userdel/02_userdel_group_rename_failure/userdel.test | 2 +- .../userdel/03_userdel_shadow_rename_failure/userdel.test | 2 +- .../userdel/04_userdel_passwd_rename_failure/userdel.test | 2 +- .../userdel/05_userdel_failure_remove_mailbox/userdel.test | 2 +- .../06_userdel_failure_remove_file_homedir/userdel.test | 2 +- .../userdel/07_userdel_failure_remove_homedir/userdel.test | 2 +- .../tmp/usermod.err | 3 --- 8 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/tmp/usermod.err diff --git a/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test b/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test index de402a0a..3b7c17ca 100755 --- a/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test +++ b/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "delete group foo (groupdel foo)..." +echo -n "delete user foo (userdel foo)..." LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/gshadow userdel foo 2>tmp/userdel.err && exit 1 || { status=$? } diff --git a/tests/failures/userdel/02_userdel_group_rename_failure/userdel.test b/tests/failures/userdel/02_userdel_group_rename_failure/userdel.test index 1ecc694a..da9b6936 100755 --- a/tests/failures/userdel/02_userdel_group_rename_failure/userdel.test +++ b/tests/failures/userdel/02_userdel_group_rename_failure/userdel.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "delete group foo (groupdel foo)..." +echo -n "delete user foo (userdel foo)..." LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/group userdel foo 2>tmp/userdel.err && exit 1 || { status=$? } diff --git a/tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test b/tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test index 84a16913..6ad2516a 100755 --- a/tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test +++ b/tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "delete group foo (groupdel foo)..." +echo -n "delete user foo (userdel foo)..." LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/shadow userdel foo 2>tmp/userdel.err && exit 1 || { status=$? } diff --git a/tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test b/tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test index faaba14f..945bf5b3 100755 --- a/tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test +++ b/tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "delete group foo (groupdel foo)..." +echo -n "delete user foo (userdel foo)..." LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/passwd userdel foo 2>tmp/userdel.err && exit 1 || { status=$? } diff --git a/tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test b/tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test index 44354388..cd0b3567 100755 --- a/tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test +++ b/tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test @@ -20,7 +20,7 @@ echo -n "Changing ownership of /var/mail/foo..." chown foo:mail /var/mail/foo echo "OK" -echo -n "delete group foo with its mail spool (groupdel -r foo)..." +echo -n "delete user foo with its mail spool (userdel -r foo)..." LD_PRELOAD=../../../common/unlink_failure.so FAILURE_PATH=/var/mail/foo userdel -r foo 2>tmp/userdel.err && exit 1 || { status=$? } diff --git a/tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test index 88f493f7..d41d1895 100755 --- a/tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test +++ b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test @@ -24,7 +24,7 @@ touch /home/foo/bar/baz chown -R foo:foo /home/foo echo "OK" -echo -n "delete group foo with its mail spool (groupdel -r foo)..." +echo -n "delete user foo with its mail spool (userdel -r foo)..." LD_PRELOAD=../../../common/unlink_failure.so FAILURE_PATH=/home/foo/bar/baz userdel -r foo 2>tmp/userdel.err && exit 1 || { status=$? } diff --git a/tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test b/tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test index c59f7880..deca4020 100755 --- a/tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test +++ b/tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test @@ -24,7 +24,7 @@ touch /home/foo/bar/baz chown -R foo:foo /home/foo echo "OK" -echo -n "delete group foo with its mail spool (groupdel -r foo)..." +echo -n "delete user foo with its mail spool (userdel -r foo)..." LD_PRELOAD=../../../common/rmdir_failure.so FAILURE_PATH=/home/foo userdel -r foo 2>tmp/userdel.err && exit 1 || { status=$? } diff --git a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/tmp/usermod.err b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/tmp/usermod.err deleted file mode 100644 index 60a59a29..00000000 --- a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/tmp/usermod.err +++ /dev/null @@ -1,3 +0,0 @@ -unlink FAILURE /etc/passwd.lock -usermod: cannot get lock /etc/passwd.lock: Device or resource busy -usermod: cannot lock /etc/passwd; try again later.