diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2019-07-26 12:32:48 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2019-07-26 12:32:48 +0300 |
| commit | 17137408d29d004e7ec1512ab7e6b7d30ff28ebe (patch) | |
| tree | 85991b6df7fa8f8d49845b48c43038b049b68121 /include/tests_mail_messaging | |
| parent | 8321b986891eae1f928434ea9ac0003ae743ab67 (diff) | |
Use IsRunning exit code instead of variable
Diffstat (limited to 'include/tests_mail_messaging')
| -rw-r--r-- | include/tests_mail_messaging | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/tests_mail_messaging b/include/tests_mail_messaging index f5770bc2..901df6dc 100644 --- a/include/tests_mail_messaging +++ b/include/tests_mail_messaging @@ -44,8 +44,7 @@ Register --test-no MAIL-8802 --weight L --network NO --category security --description "Check Exim status" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: check Exim status" - IsRunning exim4 || IsRunning exim - if [ ${RUNNING} -eq 1 ]; then + if IsRunning "exim4" || IsRunning "exim"; then LogText "Result: found running Exim process" Display --indent 2 --text "- Exim status" --result "${STATUS_RUNNING}" --color GREEN EXIM_RUNNING=1 @@ -283,8 +282,7 @@ Register --test-no MAIL-8838 --weight L --network NO --category security --description "Check dovecot process" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: check dovecot status" - IsRunning dovecot - if [ ${RUNNING} -eq 1 ]; then + if IsRunning "dovecot"; then LogText "Result: found running dovecot process" Display --indent 2 --text "- Dovecot status" --result "${STATUS_RUNNING}" --color GREEN DOVECOT_RUNNING=1 @@ -305,8 +303,7 @@ Register --test-no MAIL-8860 --weight L --network NO --category security --description "Check Qmail status" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: check Qmail status" - IsRunning qmail-smtpd - if [ ${RUNNING} -eq 1 ]; then + if IsRunning "qmail-smtpd"; then LogText "Result: found running Qmail process" Display --indent 2 --text "- Qmail status" --result "${STATUS_RUNNING}" --color GREEN QMAIL_RUNNING=1 @@ -325,8 +322,7 @@ Register --test-no MAIL-8880 --weight L --network NO --category security --description "Check Sendmail status" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: check sendmail status" - IsRunning sendmail - if [ ${RUNNING} -eq 1 ]; then + if IsRunning "sendmail"; then LogText "Result: found running Sendmail process" Display --indent 2 --text "- Sendmail status" --result "${STATUS_RUNNING}" --color GREEN SENDMAIL_RUNNING=1 |