]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/selftest/tinfoil: Update to use test command
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 25 Sep 2021 10:42:57 +0000 (11:42 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 26 Sep 2021 13:36:49 +0000 (14:36 +0100)
We've had IO load issues on the autobuilder with this test. Avoid
those by using a specilised test command instead.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/selftest/cases/tinfoil.py

index 51092805d8f7bf007e68aeb81a6c82ab62a0f2c0..8fd48bb05405a241d114e64f109d06dba1709947 100644 (file)
@@ -94,14 +94,13 @@ class TinfoilTests(OESelftestTestCase):
                 pass
 
             pattern = 'conf'
-            res = tinfoil.run_command('findFilesMatchingInDir', pattern, 'conf/machine')
+            res = tinfoil.run_command('testCookerCommandEvent', pattern)
             self.assertTrue(res)
 
             eventreceived = False
             commandcomplete = False
             start = time.time()
             # Wait for maximum 60s in total so we'd detect spurious heartbeat events for example
-            # The test is IO load sensitive too
             while (not (eventreceived == True and commandcomplete == True) 
                     and (time.time() - start < 60)):
                 # if we received both events (on let's say a good day), we are done  
@@ -111,7 +110,8 @@ class TinfoilTests(OESelftestTestCase):
                         commandcomplete = True
                     elif isinstance(event, bb.event.FilesMatchingFound):
                         self.assertEqual(pattern, event._pattern)
-                        self.assertIn('qemuarm.conf', event._matches)
+                        self.assertIn('A', event._matches)
+                        self.assertIn('B', event._matches)
                         eventreceived = True
                     elif isinstance(event, logging.LogRecord):
                         continue