diff --git a/tests/usertools/24_usermod_locked_passwd/data/usermod.err b/tests/usertools/24_usermod_locked_passwd/data/usermod.err index 3d1b7302..b1d59ec8 100644 --- a/tests/usertools/24_usermod_locked_passwd/data/usermod.err +++ b/tests/usertools/24_usermod_locked_passwd/data/usermod.err @@ -1 +1,2 @@ +usermod: existing lock file /etc/passwd.lock without a PID usermod: cannot lock /etc/passwd; try again later. diff --git a/tests/usertools/25_usermod-G_locked_group/data/usermod.err b/tests/usertools/25_usermod-G_locked_group/data/usermod.err index a84ef88d..4b1d8f95 100644 --- a/tests/usertools/25_usermod-G_locked_group/data/usermod.err +++ b/tests/usertools/25_usermod-G_locked_group/data/usermod.err @@ -1 +1,2 @@ +usermod: existing lock file /etc/group.lock without a PID usermod: cannot lock /etc/group; try again later. diff --git a/tests/usertools/26_usermod_locked_shadow/data/usermod.err b/tests/usertools/26_usermod_locked_shadow/data/usermod.err index 6f819a0a..f490717a 100644 --- a/tests/usertools/26_usermod_locked_shadow/data/usermod.err +++ b/tests/usertools/26_usermod_locked_shadow/data/usermod.err @@ -1 +1,2 @@ +usermod: existing lock file /etc/shadow.lock without a PID usermod: cannot lock /etc/shadow; try again later. diff --git a/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err b/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err index be31f738..d065cee0 100644 --- a/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err +++ b/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err @@ -1 +1,2 @@ +usermod: existing lock file /etc/gshadow.lock without a PID usermod: cannot lock /etc/gshadow; try again later. diff --git a/tests/usertools/30_usermod-l_locked_group/data/usermod.err b/tests/usertools/30_usermod-l_locked_group/data/usermod.err index a84ef88d..4b1d8f95 100644 --- a/tests/usertools/30_usermod-l_locked_group/data/usermod.err +++ b/tests/usertools/30_usermod-l_locked_group/data/usermod.err @@ -1 +1,2 @@ +usermod: existing lock file /etc/group.lock without a PID usermod: cannot lock /etc/group; try again later. diff --git a/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err b/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err index be31f738..d065cee0 100644 --- a/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err +++ b/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err @@ -1 +1,2 @@ +usermod: existing lock file /etc/gshadow.lock without a PID usermod: cannot lock /etc/gshadow; try again later. diff --git a/tests/usertools/55_userdel_busy_user/data/userdel.err b/tests/usertools/55_userdel_busy_user/data/userdel.err index 0d6004cb..860d0967 100644 --- a/tests/usertools/55_userdel_busy_user/data/userdel.err +++ b/tests/usertools/55_userdel_busy_user/data/userdel.err @@ -1 +1 @@ -userdel: user foo is currently logged in +userdel: user foo is currently used by process diff --git a/tests/usertools/55_userdel_busy_user/userdel.test b/tests/usertools/55_userdel_busy_user/userdel.test index 37822c6e..45d6e3fb 100755 --- a/tests/usertools/55_userdel_busy_user/userdel.test +++ b/tests/usertools/55_userdel_busy_user/userdel.test @@ -40,6 +40,7 @@ echo "=======================================================================" cat tmp/userdel.err echo "=======================================================================" echo -n "Check that there were a failure message..." +sed -i -e "s/ [0-9]*$/ /" tmp/userdel.err diff -au data/userdel.err tmp/userdel.err echo "error message OK." rm -f tmp/userdel.err diff --git a/tests/usertools/56_userdel_locked_passwd/data/userdel.err b/tests/usertools/56_userdel_locked_passwd/data/userdel.err index e75898b7..183acb4c 100644 --- a/tests/usertools/56_userdel_locked_passwd/data/userdel.err +++ b/tests/usertools/56_userdel_locked_passwd/data/userdel.err @@ -1 +1,2 @@ +userdel: existing lock file /etc/passwd.lock without a PID userdel: cannot lock /etc/passwd; try again later. diff --git a/tests/usertools/57_userdel_locked_group/data/userdel.err b/tests/usertools/57_userdel_locked_group/data/userdel.err index 69d059d1..1e947b22 100644 --- a/tests/usertools/57_userdel_locked_group/data/userdel.err +++ b/tests/usertools/57_userdel_locked_group/data/userdel.err @@ -1 +1,2 @@ +userdel: existing lock file /etc/group.lock without a PID userdel: cannot lock /etc/group; try again later. diff --git a/tests/usertools/58_userdel_locked_shadow/data/userdel.err b/tests/usertools/58_userdel_locked_shadow/data/userdel.err index e1cf68aa..324b9ec7 100644 --- a/tests/usertools/58_userdel_locked_shadow/data/userdel.err +++ b/tests/usertools/58_userdel_locked_shadow/data/userdel.err @@ -1 +1,2 @@ +userdel: existing lock file /etc/shadow.lock without a PID userdel: cannot lock /etc/shadow; try again later. diff --git a/tests/usertools/59_userdel_locked_gshadow/data/userdel.err b/tests/usertools/59_userdel_locked_gshadow/data/userdel.err index acc7dfc1..7a567713 100644 --- a/tests/usertools/59_userdel_locked_gshadow/data/userdel.err +++ b/tests/usertools/59_userdel_locked_gshadow/data/userdel.err @@ -1 +1,2 @@ +userdel: existing lock file /etc/gshadow.lock without a PID userdel: cannot lock /etc/gshadow; try again later.