From ff215337723c85f046b0eb91268e071cae512071 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Thu, 14 Jul 2011 17:20:29 +0000 Subject: [PATCH] The reason for the lock failure is now indicated in the failure message. --- .../gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err | 1 + .../gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err | 1 + .../groupadd/08_groupadd_locked_group/data/groupadd.err | 1 + .../groupadd/09_groupadd_locked_gshadow/data/groupadd.err | 1 + .../data/groupdel.err | 1 + .../data/groupdel.err | 1 + .../17_groupmod_change_gid_error_locked_group/data/groupmod.err | 1 + .../data/groupmod.err | 1 + .../data/groupmod.err | 1 + 9 files changed, 9 insertions(+) diff --git a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err index 32dc7909..dec0fe74 100644 --- a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err +++ b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err @@ -1 +1,2 @@ +gpasswd: existing lock file /etc/group.lock without a PID gpasswd: cannot lock /etc/group; try again later. diff --git a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err index a44907e0..4c5a8725 100644 --- a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err +++ b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err @@ -1 +1,2 @@ +gpasswd: existing lock file /etc/gshadow.lock without a PID gpasswd: cannot lock /etc/gshadow; try again later. diff --git a/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err b/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err index cd895dcd..33604e5e 100644 --- a/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err +++ b/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err @@ -1 +1,2 @@ +groupadd: existing lock file /etc/group.lock without a PID groupadd: cannot lock /etc/group; try again later. diff --git a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err index bfaeae55..c64e0a9c 100644 --- a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err +++ b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err @@ -1 +1,2 @@ +groupadd: existing lock file /etc/gshadow.lock without a PID groupadd: cannot lock /etc/gshadow; try again later. diff --git a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err index a2be4919..ed52317b 100644 --- a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err +++ b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err @@ -1 +1,2 @@ +groupdel: existing lock file /etc/group.lock without a PID groupdel: cannot lock /etc/group; try again later. diff --git a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err index 80f021cb..66f2eaf0 100644 --- a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err +++ b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err @@ -1 +1,2 @@ +groupdel: existing lock file /etc/gshadow.lock without a PID groupdel: cannot lock /etc/gshadow; try again later. diff --git a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err index 4355a923..e399ec7b 100644 --- a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err +++ b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err @@ -1 +1,2 @@ +groupmod: existing lock file /etc/group.lock without a PID groupmod: cannot lock /etc/group; try again later. diff --git a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/groupmod.err b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/groupmod.err index 5e7d27b8..3b3400f1 100644 --- a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/groupmod.err +++ b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/groupmod.err @@ -1 +1,2 @@ +groupmod: existing lock file /etc/gshadow.lock without a PID groupmod: cannot lock /etc/gshadow; try again later. diff --git a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/groupmod.err b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/groupmod.err index 821d51cb..5d391a09 100644 --- a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/groupmod.err +++ b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/groupmod.err @@ -1 +1,2 @@ +groupmod: existing lock file /etc/passwd.lock without a PID groupmod: cannot lock /etc/passwd; try again later.