From a48c014e7bf11391734c05fac6552bbef2dc2086 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 6 Jan 2020 09:48:41 -0500 Subject: meta-security: subtree update:3001c3ebfc..b72cc7f87c Armin Kuster (10): apparmor: add distro check smack: add distro check python-fail2ban: Drop python2 package python3-fail2ban: include python-fail2ban.inc google-authenticator-libpam: update to 1.07 smack-test: add feature check for smack lib/oeqa/runtime: fix clamav test order clamav: update to 0.101.5 meta-integrity: fix issues with yocto-check-layer fail2ban: fix runtime error Change-Id: I4f7e656b0f9e2e9dc32989a1756c94e4e0143c42 Signed-off-by: Brad Bishop --- meta-security/lib/oeqa/runtime/cases/clamav.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'meta-security/lib') diff --git a/meta-security/lib/oeqa/runtime/cases/clamav.py b/meta-security/lib/oeqa/runtime/cases/clamav.py index 2808df4dc..cf8393732 100644 --- a/meta-security/lib/oeqa/runtime/cases/clamav.py +++ b/meta-security/lib/oeqa/runtime/cases/clamav.py @@ -48,6 +48,15 @@ class ClamavTest(OERuntimeTestCase): self.assertEqual(status, 0, msg = msg) @OETestDepends(['clamav.ClamavTest.test_ping_clamav_net']) + def test_freshclam_check_mirrors(self): + status, output = self.target.run('freshclam --list-mirrors') + match = re.search('Failures: 0', output) + if not match: + msg = ('freshclam --list-mirrors: failed. ' + 'Status and output:%s and %s' % (status, output)) + self.assertEqual(status, 1, msg = msg) + + @OETestDepends(['clamav.ClamavTest.test_freshclam_check_mirrors']) def test_freshclam_download(self): status, output = self.target.run('freshclam --show-progress') match = re.search('Database updated', output) @@ -57,12 +66,3 @@ class ClamavTest(OERuntimeTestCase): 'Status and output:%s and %s' % (status, output)) self.assertEqual(status, 1, msg = msg) - @OETestDepends(['clamav.ClamavTest.test_ping_clamav_net']) - def test_freshclam_check_mirrors(self): - status, output = self.target.run('freshclam --list-mirrors') - match = re.search('Failures: 0', output) - if not match: - msg = ('freshclam --list-mirrors: failed. ' - 'Status and output:%s and %s' % (status, output)) - self.assertEqual(status, 1, msg = msg) - -- cgit v1.2.3