diff --git a/tests/usertools/10_userdel_del_homedir_wrong_owner/userdel.test b/tests/usertools/10_userdel_del_homedir_wrong_owner/userdel.test index 1feb378e..37b1674a 100755 --- a/tests/usertools/10_userdel_del_homedir_wrong_owner/userdel.test +++ b/tests/usertools/10_userdel_del_homedir_wrong_owner/userdel.test @@ -23,7 +23,7 @@ chown -R foo:foo /var/mail/foo chown -R root:root /home/foo echo -n "Delete user foo (userdel -r foo)..." -userdel -r foo 2>tmp/userdel.err && exit || { +userdel -r foo 2>tmp/userdel.err && exit 1 || { status=$? } echo "OK" diff --git a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test index 14c2bd83..5742dba0 100755 --- a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test +++ b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test @@ -17,7 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config echo -n "Change the user's list of supplementary groups (usermod -G bin,damon foo)..." -usermod -G bin,damon foo 2>tmp/usermod.err && exit || { +usermod -G bin,damon foo 2>tmp/usermod.err && exit 1 || { status=$? } echo "OK" diff --git a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test index d29b0335..548b7d0a 100755 --- a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test +++ b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test @@ -17,7 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config echo -n "Change the user's list of supplementary groups (usermod -G bin,4242,daemon foo)..." -usermod -G bin,4242,daemon foo 2>tmp/usermod.err && exit || { +usermod -G bin,4242,daemon foo 2>tmp/usermod.err && exit 1 || { status=$? } echo "OK" diff --git a/tests/usertools/24_usermod_locked_passwd/usermod.test b/tests/usertools/24_usermod_locked_passwd/usermod.test index d60176e2..adff8d1e 100755 --- a/tests/usertools/24_usermod_locked_passwd/usermod.test +++ b/tests/usertools/24_usermod_locked_passwd/usermod.test @@ -21,7 +21,7 @@ touch /etc/passwd.lock echo "done" echo -n "Change the user's list of supplementary groups (usermod -G bin foo)..." -usermod -G bin foo 2>tmp/usermod.err && exit || { +usermod -G bin foo 2>tmp/usermod.err && exit 1 || { status=$? } echo "OK" diff --git a/tests/usertools/25_usermod-G_locked_group/usermod.test b/tests/usertools/25_usermod-G_locked_group/usermod.test index 3edc8504..f7306056 100755 --- a/tests/usertools/25_usermod-G_locked_group/usermod.test +++ b/tests/usertools/25_usermod-G_locked_group/usermod.test @@ -21,7 +21,7 @@ touch /etc/group.lock echo "done" echo -n "Change the user's list of supplementary groups (usermod -G bin foo)..." -usermod -G bin foo 2>tmp/usermod.err && exit || { +usermod -G bin foo 2>tmp/usermod.err && exit 1 || { status=$? } echo "OK" diff --git a/tests/usertools/26_usermod_locked_shadow/usermod.test b/tests/usertools/26_usermod_locked_shadow/usermod.test index 20da70bf..b5981012 100755 --- a/tests/usertools/26_usermod_locked_shadow/usermod.test +++ b/tests/usertools/26_usermod_locked_shadow/usermod.test @@ -21,7 +21,7 @@ touch /etc/shadow.lock echo "done" echo -n "Change the user's list of supplementary groups (usermod -G bin foo)..." -usermod -G bin foo 2>tmp/usermod.err && exit || { +usermod -G bin foo 2>tmp/usermod.err && exit 1 || { status=$? } echo "OK" diff --git a/tests/usertools/27_usermod-G_locked_gshadow/usermod.test b/tests/usertools/27_usermod-G_locked_gshadow/usermod.test index 64b96018..043fd585 100755 --- a/tests/usertools/27_usermod-G_locked_gshadow/usermod.test +++ b/tests/usertools/27_usermod-G_locked_gshadow/usermod.test @@ -21,7 +21,7 @@ touch /etc/gshadow.lock echo "done" echo -n "Change the user's list of supplementary groups (usermod -G bin foo)..." -usermod -G bin foo 2>tmp/usermod.err && exit || { +usermod -G bin foo 2>tmp/usermod.err && exit 1 || { status=$? } echo "OK" diff --git a/tests/usertools/30_usermod-l_locked_group/usermod.test b/tests/usertools/30_usermod-l_locked_group/usermod.test index e688d7ad..624ec211 100755 --- a/tests/usertools/30_usermod-l_locked_group/usermod.test +++ b/tests/usertools/30_usermod-l_locked_group/usermod.test @@ -21,7 +21,7 @@ touch /etc/group.lock echo "done" echo -n "Change the user's list of supplementary groups (usermod -l foo2 foo)..." -usermod -l foo2 foo 2>tmp/usermod.err && exit || { +usermod -l foo2 foo 2>tmp/usermod.err && exit 1 || { status=$? } echo "OK" diff --git a/tests/usertools/31_usermod-l_locked_gshadow/usermod.test b/tests/usertools/31_usermod-l_locked_gshadow/usermod.test index 74696c0b..4cc387b0 100755 --- a/tests/usertools/31_usermod-l_locked_gshadow/usermod.test +++ b/tests/usertools/31_usermod-l_locked_gshadow/usermod.test @@ -21,7 +21,7 @@ touch /etc/gshadow.lock echo "done" echo -n "Change the user's list of supplementary groups (usermod -l foo2 foo)..." -usermod -l foo2 foo 2>tmp/usermod.err && exit || { +usermod -l foo2 foo 2>tmp/usermod.err && exit 1 || { status=$? } echo "OK" diff --git a/tests/usertools/33_usermod-u_existing_UID/usermod.test b/tests/usertools/33_usermod-u_existing_UID/usermod.test index f2442cd1..4210596e 100755 --- a/tests/usertools/33_usermod-u_existing_UID/usermod.test +++ b/tests/usertools/33_usermod-u_existing_UID/usermod.test @@ -17,7 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config echo -n "Change the user's UID (usermod -u 1001 foo)..." -usermod -u 1001 foo 2>tmp/usermod.err && exit || { +usermod -u 1001 foo 2>tmp/usermod.err && exit 1 || { status=$? } echo "OK" diff --git a/tests/usertools/35_usermod-u_invalid_UID/usermod.test b/tests/usertools/35_usermod-u_invalid_UID/usermod.test index e7b5e6af..5a5b3422 100755 --- a/tests/usertools/35_usermod-u_invalid_UID/usermod.test +++ b/tests/usertools/35_usermod-u_invalid_UID/usermod.test @@ -17,7 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config echo -n "Change the user's UID (usermod -u 100a1 foo)..." -usermod -u 100a1 foo 2>tmp/usermod.err && exit || { +usermod -u 100a1 foo 2>tmp/usermod.err && exit 1 || { status=$? } echo "OK"