From fa90ab06aa09224d5a1fbac69c9bc0f067099206 Mon Sep 17 00:00:00 2001 From: Micah Date: Mon, 30 Nov 2015 12:48:10 -0500 Subject: improve whitebox tests to match on more specific processes (#7655, #7676) Change-Id: I9f267ba38130ceb308d284c926b14d2cee9f87be --- tests/white-box/mx.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/white-box/mx.rb') diff --git a/tests/white-box/mx.rb b/tests/white-box/mx.rb index 8b5cc485..ba523fe0 100644 --- a/tests/white-box/mx.rb +++ b/tests/white-box/mx.rb @@ -32,15 +32,15 @@ class Mx < LeapTest end def test_03_Are_MX_daemons_running? - assert_running 'leap_mx' - 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/sbin/clamd -c /etc/clamav/clamd.conf$' - assert_running '^/usr/sbin/clamav-milter --config-file=/etc/clamav/clamav-milter.conf$' - assert_running '^/usr/bin/freshclam -d --quiet --config-file=/etc/clamav/freshclam.conf$' + assert_running '.*/usr/bin/twistd.*leap_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/sbin/clamd' + assert_running '^/usr/sbin/clamav-milter' + assert_running '^/usr/bin/freshclam' pass end -- cgit v1.2.3