summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-25 10:42:57 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-26 15:35:00 (GMT)
commita3d96f122c921197c8ee6596041d7282fe0140fd (patch)
tree10fbf7b5ab732f3da88705fe54d92af1b773be4a
parent37b4fa7a102f1212843411bd1d97202ba9da0e19 (diff)
downloadpoky-a3d96f122c921197c8ee6596041d7282fe0140fd.tar.gz
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. (From OE-Core rev: 106445b1eb74fc37e03c72a0c011541b50a16c19) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/tinfoil.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py b/meta/lib/oeqa/selftest/cases/tinfoil.py
index 5109280..8fd48bb 100644
--- a/meta/lib/oeqa/selftest/cases/tinfoil.py
+++ b/meta/lib/oeqa/selftest/cases/tinfoil.py
@@ -94,14 +94,13 @@ class TinfoilTests(OESelftestTestCase):
94 pass 94 pass
95 95
96 pattern = 'conf' 96 pattern = 'conf'
97 res = tinfoil.run_command('findFilesMatchingInDir', pattern, 'conf/machine') 97 res = tinfoil.run_command('testCookerCommandEvent', pattern)
98 self.assertTrue(res) 98 self.assertTrue(res)
99 99
100 eventreceived = False 100 eventreceived = False
101 commandcomplete = False 101 commandcomplete = False
102 start = time.time() 102 start = time.time()
103 # Wait for maximum 60s in total so we'd detect spurious heartbeat events for example 103 # Wait for maximum 60s in total so we'd detect spurious heartbeat events for example
104 # The test is IO load sensitive too
105 while (not (eventreceived == True and commandcomplete == True) 104 while (not (eventreceived == True and commandcomplete == True)
106 and (time.time() - start < 60)): 105 and (time.time() - start < 60)):
107 # if we received both events (on let's say a good day), we are done 106 # if we received both events (on let's say a good day), we are done
@@ -111,7 +110,8 @@ class TinfoilTests(OESelftestTestCase):
111 commandcomplete = True 110 commandcomplete = True
112 elif isinstance(event, bb.event.FilesMatchingFound): 111 elif isinstance(event, bb.event.FilesMatchingFound):
113 self.assertEqual(pattern, event._pattern) 112 self.assertEqual(pattern, event._pattern)
114 self.assertIn('qemuarm.conf', event._matches) 113 self.assertIn('A', event._matches)
114 self.assertIn('B', event._matches)
115 eventreceived = True 115 eventreceived = True
116 elif isinstance(event, logging.LogRecord): 116 elif isinstance(event, logging.LogRecord):
117 continue 117 continue