From dab3b9227dc2f7977c5f34396f132984fa0485bf Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 15 Mar 2016 15:41:39 +0100 Subject: [bug] Clamav test depends on multiple files The systemd clamav service depends on these files, see the `/lib/systemd/system/clamav-daemon.service` unit file: ConditionPathExistsGlob=/var/lib/clamav/main.{c[vl]d,inc} ConditionPathExistsGlob=/var/lib/clamav/daily.{c[vl]d,inc} Also, leap test should always check for the freshclam daemon. - Resolves: #7683 --- tests/white-box/mx.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/white-box/mx.rb b/tests/white-box/mx.rb index 9f577516..9335649a 100644 --- a/tests/white-box/mx.rb +++ b/tests/white-box/mx.rb @@ -38,12 +38,12 @@ class Mx < LeapTest assert_running 'postfwd2::cache$' assert_running 'postfwd2::policy$' assert_running '^/usr/sbin/unbound$' - if File.exists?('/var/lib/clamav/daily.cld') + assert_running '^/usr/bin/freshclam' + 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 > 1 assert_running '^/usr/sbin/clamd' assert_running '^/usr/sbin/clamav-milter' - assert_running '^/usr/bin/freshclam' else - skip "The clamav signature file (/var/lib/clamav/daily.cld) has yet to be downloaded, so clamd is not running." + skip "Downloading the clamav signature files (/var/lib/clamav/{daily,main}.{c[vl]d,inc}) is still in progress, so clamd is not running.\nDon't worry, mail delivery will work without clamav. The download should finish soon." end pass end -- cgit v1.2.3