diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-14 11:04:39 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-16 00:03:15 +0100 |
commit | d2697f92e9961d76a3e9b429e33d2d0a1e8ac6d9 (patch) | |
tree | 0d8e1a3d6fa9c8f854889b4034198067e1ae6d84 /meta/lib | |
parent | 27ea26e3d674476d77257e731703f70faaba780b (diff) | |
download | poky-d2697f92e9961d76a3e9b429e33d2d0a1e8ac6d9.tar.gz |
selftest/tinfoil: Filter LogRecords in test_event_wait
As the code stands today, an event mask does not mask LogRecord events
since the log levels are controlled separately. We therefore need to
accept (and ignore) LogRecord events in this test to avoid errors.
(From OE-Core rev: efe1f2c8ad09af3c5ee9c778601c7463c532b012)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/tinfoil.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py b/meta/lib/oeqa/selftest/cases/tinfoil.py index aa1af7e042..471517fb29 100644 --- a/meta/lib/oeqa/selftest/cases/tinfoil.py +++ b/meta/lib/oeqa/selftest/cases/tinfoil.py | |||
@@ -1,6 +1,7 @@ | |||
1 | import os | 1 | import os |
2 | import re | 2 | import re |
3 | import time | 3 | import time |
4 | import logging | ||
4 | import bb.tinfoil | 5 | import bb.tinfoil |
5 | 6 | ||
6 | from oeqa.selftest.case import OESelftestTestCase | 7 | from oeqa.selftest.case import OESelftestTestCase |
@@ -127,6 +128,8 @@ class TinfoilTests(OESelftestTestCase): | |||
127 | self.assertEqual(pattern, event._pattern) | 128 | self.assertEqual(pattern, event._pattern) |
128 | self.assertIn('qemuarm.conf', event._matches) | 129 | self.assertIn('qemuarm.conf', event._matches) |
129 | eventreceived = True | 130 | eventreceived = True |
131 | elif isinstance(event, logging.LogRecord): | ||
132 | continue | ||
130 | else: | 133 | else: |
131 | self.fail('Unexpected event: %s' % event) | 134 | self.fail('Unexpected event: %s' % event) |
132 | 135 | ||