From: Richard Purdie Date: Sat, 25 Sep 2021 10:42:57 +0000 (+0100) Subject: oeqa/selftest/tinfoil: Update to use test command X-Git-Tag: yocto-3.1.14~29 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=351b02feb9cb680aa3dbe4c8ea4162a6456a469f;p=openembedded-core.git oeqa/selftest/tinfoil: Update to use test command 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 (cherry picked from commit 106445b1eb74fc37e03c72a0c011541b50a16c19) Signed-off-by: Steve Sakoman --- diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py b/meta/lib/oeqa/selftest/cases/tinfoil.py index a51c6048d3..0204537d49 100644 --- a/meta/lib/oeqa/selftest/cases/tinfoil.py +++ b/meta/lib/oeqa/selftest/cases/tinfoil.py @@ -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