summaryrefslogtreecommitdiff
path: root/tests/server-tests/white-box/mx.rb
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2017-02-09 16:34:56 -0800
committerelijah <elijah@riseup.net>2017-02-09 16:34:56 -0800
commit9e68982b4ef8af087e8792e502d37632d1a9a0e8 (patch)
treec5a9d8e24ac3c498972fa25ecded9b0eb5e0dd90 /tests/server-tests/white-box/mx.rb
parent36e47f7ae592e753149928a2a754d5e6f5abf74f (diff)
tests: check process by either process scan or service name. closes #8753
Diffstat (limited to 'tests/server-tests/white-box/mx.rb')
-rw-r--r--tests/server-tests/white-box/mx.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/server-tests/white-box/mx.rb b/tests/server-tests/white-box/mx.rb
index ecc8686c..432f4e54 100644
--- a/tests/server-tests/white-box/mx.rb
+++ b/tests/server-tests/white-box/mx.rb
@@ -52,17 +52,17 @@ class Mx < LeapTest
end
def test_04_Are_MX_daemons_running?
- assert_running '.*/usr/bin/twistd.*mx.tac'
- assert_running '^/usr/lib/postfix/master$'
- assert_running '^/usr/sbin/postfwd'
- assert_running 'postfwd2::cache$'
- assert_running 'postfwd2::policy$'
- assert_running '^/usr/sbin/unbound'
- assert_running '^/usr/bin/freshclam'
- assert_running '^/usr/sbin/opendkim'
+ assert_running match: '.*/usr/bin/twistd.*mx.tac'
+ assert_running match: '^/usr/lib/postfix/master$'
+ assert_running match: '^/usr/sbin/postfwd'
+ assert_running match: 'postfwd2::cache$'
+ assert_running match: 'postfwd2::policy$'
+ assert_running match: '^/usr/sbin/unbound'
+ assert_running match: '^/usr/bin/freshclam'
+ assert_running match: '^/usr/sbin/opendkim'
if Dir.glob("/var/lib/clamav/main.{c[vl]d,inc}").size > 0 and Dir.glob("/var/lib/clamav/daily.{c[vl]d,inc}").size > 0
- assert_running '^/usr/sbin/clamd'
- assert_running '^/usr/sbin/clamav-milter'
+ assert_running match: '^/usr/sbin/clamd'
+ assert_running match: '^/usr/sbin/clamav-milter'
pass
else
skip "Downloading the clamav signature files (/var/lib/clamav/{daily,main}.{c[vl]d,inc}) is still in progress, so clamd is not running."