Skip to contentSkip to conversation

oeqa/clamav drop depricated --list-mirror test

PATCH In review Armin Kuster 1 participant 4 messages Jun 20, 2022 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 oeqa/clamav drop depricated --list-mirror test

Fix download test

---
 lib/oeqa/runtime/cases/clamav.py | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)
lib/oeqa/runtime/cases/clamav.py +4 -17
index cf83937..e0cad8f 100644
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 Armin Kuster <[email protected]>
+# Copyright (C) 2019 - 2022 Armin Kuster <[email protected]>
 #
 import re
 from tempfile import mkstemp
@@ -48,21 +48,8 @@ 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)
-        #match = re.search('main.cvd is up to date', output)
-        if not match:
-            msg = ('freshclam : DB dowbload failed. '
-               'Status and output:%s and %s' % (status, output))
-            self.assertEqual(status, 1, msg = msg)
-
+        msg = ('freshclam : DB dowbload failed. '
+            'Status and output:%s and %s' % (status, output))
+        self.assertEqual(status, 0, msg = msg)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/3 oeqa: meta-tpm shut swtpm down before and after testing

fixes:
swtpm: Could not open TCP socket: Address already in use

---
 meta-tpm/lib/oeqa/runtime/cases/swtpm.py | 2 ++
 meta-tpm/lib/oeqa/runtime/cases/tpm2.py  | 2 ++
 2 files changed, 4 insertions(+)
meta-tpm/lib/oeqa/runtime/cases/swtpm.py +2 -0
index df47b35..0be5c59 100644
@@ -8,11 +8,13 @@ from oeqa.core.decorator.data import skipIfNotFeature
 class SwTpmTest(OERuntimeTestCase):
     @classmethod
     def setUpClass(cls):
+        cls.tc.target.run('swtpm_ioctl -s --tcp :2322')
         cls.tc.target.run('mkdir /tmp/myvtpm2')
         cls.tc.target.run('chown tss:root /tmp/myvtpm2')
 
     @classmethod
     def tearDownClass(cls):
+        cls.tc.target.run('swtpm_ioctl -s --tcp :2322')
         cls.tc.target.run('rm -fr /tmp/myvtpm2')
 
     @skipIfNotFeature('tpm2','Test tpm2_swtpm_socket requires tpm2 to be in DISTRO_FEATURES')
meta-tpm/lib/oeqa/runtime/cases/tpm2.py +2 -0
index e64d19d..8e90dc9 100644
@@ -8,10 +8,12 @@ from oeqa.core.decorator.data import skipIfNotFeature
 class Tpm2Test(OERuntimeTestCase):
     @classmethod
     def setUpClass(cls):
+        cls.tc.target.run('swtpm_ioctl -s --tcp :2322')
         cls.tc.target.run('mkdir /tmp/myvtpm2')
 
     @classmethod
     def tearDownClass(cls):
+        cls.tc.target.run('swtpm_ioctl -s --tcp :2322')
         cls.tc.target.run('rm -fr /tmp/myvtpm2')
 
     def check_endlines(self, results,  expected_endlines): 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 3/3 oeqa: shut done swtpm before and after testing

In reply to Armin Kuster

fixes:
swtpm: Could not open TCP socket: Address already in use

---
 meta-parsec/lib/oeqa/runtime/cases/parsec.py | 5 +++++
 1 file changed, 5 insertions(+)
meta-parsec/lib/oeqa/runtime/cases/parsec.py +5 -0
index d3d3f2e..11e5572 100644
@@ -12,8 +12,13 @@ from oeqa.core.decorator.data import skipIfNotFeature
 class ParsecTest(OERuntimeTestCase):
     @classmethod
     def setUpClass(cls):
+        cls.tc.target.run('swtpm_ioctl -s --tcp :2322')
         cls.toml_file = '/etc/parsec/config.toml'
 
+    @classmethod
+    def tearDownClass(cls):
+        cls.tc.target.run('swtpm_ioctl -s --tcp :2322')
+
     def setUp(self):
         super(ParsecTest, self).setUp()
         if 'systemd' in self.tc.td['DISTRO_FEATURES']:
Signature · 1 line
2.25.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#4 lore raw

Re: [yocto] [meta-security][PATCH 3/3] oeqa: shut done swtpm before and after testing

fyi:
I started to archive some of the test runs at:
https://github.com/akuster/meta-security-testresults
Not sure if I am doing this correctly but is at least a snapshot.

-armin

Quoted 35 lines · Armin Kuster via lists.yoctoproject.org

fixes:
swtpm: Could not open TCP socket: Address already in use

---
  meta-parsec/lib/oeqa/runtime/cases/parsec.py | 5 +++++
  1 file changed, 5 insertions(+)
meta-parsec/lib/oeqa/runtime/cases/parsec.py +5 -1
index d3d3f2e..11e5572 100644
@@ -12,8 +12,13 @@ from oeqa.core.decorator.data import skipIfNotFeature
  class ParsecTest(OERuntimeTestCase):
      @classmethod
      def setUpClass(cls):
+        cls.tc.target.run('swtpm_ioctl -s --tcp :2322')
          cls.toml_file = '/etc/parsec/config.toml'
 
+    @classmethod
+    def tearDownClass(cls):
+        cls.tc.target.run('swtpm_ioctl -s --tcp :2322')
+
      def setUp(self):
          super(ParsecTest, self).setUp()
          if 'systemd' in self.tc.td['DISTRO_FEATURES']:
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#57358): https://lists.yoctoproject.org/g/yocto/message/57358
Mute This Topic: https://lists.yoctoproject.org/mt/91870539/3616698
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-