diff --git a/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err b/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err index 02b7efe1..4a63d73c 100644 --- a/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err +++ b/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err @@ -1 +1,2 @@ +grpconv: lock /etc/group.lock already used by PID grpconv: cannot lock /etc/group; try again later. diff --git a/tests/convtools/06_grpconv_error_group_locked/grpconv.test b/tests/convtools/06_grpconv_error_group_locked/grpconv.test index bd9f46f6..878d80d2 100755 --- a/tests/convtools/06_grpconv_error_group_locked/grpconv.test +++ b/tests/convtools/06_grpconv_error_group_locked/grpconv.test @@ -17,7 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/group.lock' 0 change_config echo -n "Create lock file for /etc/group..." -touch /etc/group.lock +echo -n $$ > /etc/group.lock echo "done" echo -n "Convert the group files (grpconv)..." @@ -39,6 +39,7 @@ echo "=======================================================================" cat tmp/grpconv.err echo "=======================================================================" echo -n "Check that there were a failure message..." +sed -i -e "s/$$//" tmp/grpconv.err diff -au data/grpconv.err tmp/grpconv.err echo "error message OK." rm -f tmp/grpconv.err diff --git a/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err b/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err index 812e3542..527ecae6 100644 --- a/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err +++ b/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err @@ -1 +1,2 @@ +grpconv: existing lock file /etc/gshadow.lock without a PID grpconv: cannot lock /etc/gshadow; try again later. diff --git a/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err b/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err index 028c6024..ddfae6f4 100644 --- a/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err +++ b/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err @@ -1 +1,2 @@ +grpunconv: existing lock file /etc/group.lock without a PID grpunconv: cannot lock /etc/group; try again later. diff --git a/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err b/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err index 507613d6..55470971 100644 --- a/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err +++ b/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err @@ -1 +1,2 @@ +grpunconv: existing lock file /etc/gshadow.lock without a PID grpunconv: cannot lock /etc/gshadow; try again later. diff --git a/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err b/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err index 37398b74..bf83d748 100644 --- a/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err +++ b/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err @@ -1 +1,2 @@ +pwconv: existing lock file /etc/passwd.lock without a PID pwconv: cannot lock /etc/passwd; try again later. diff --git a/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err b/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err index 2393ab31..3ac90484 100644 --- a/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err +++ b/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err @@ -1 +1,2 @@ +pwconv: existing lock file /etc/shadow.lock without a PID pwconv: cannot lock /etc/shadow; try again later. diff --git a/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err b/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err index d7a5302b..40d2244a 100644 --- a/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err +++ b/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err @@ -1 +1,2 @@ +pwunconv: existing lock file /etc/passwd.lock without a PID pwunconv: cannot lock /etc/passwd; try again later. diff --git a/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err b/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err index ce17416d..20de665d 100644 --- a/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err +++ b/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err @@ -1 +1,2 @@ +pwunconv: existing lock file /etc/shadow.lock without a PID pwunconv: cannot lock /etc/shadow; try again later.