[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7195/8267] selftest/tinfoil: Filter LogRecords in test_event_wait



commit d2697f92e9961d76a3e9b429e33d2d0a1e8ac6d9
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Mon Aug 14 11:04:39 2017 +0100

    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>

 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 aa1af7e..471517f 100644
--- a/meta/lib/oeqa/selftest/cases/tinfoil.py
+++ b/meta/lib/oeqa/selftest/cases/tinfoil.py
@@ -1,6 +1,7 @@
 import os
 import re
 import time
+import logging
 import bb.tinfoil
 
 from oeqa.selftest.case import OESelftestTestCase
@@ -127,6 +128,8 @@ class TinfoilTests(OESelftestTestCase):
                         self.assertEqual(pattern, event._pattern)
                         self.assertIn('qemuarm.conf', event._matches)
                         eventreceived = True
+                    elif isinstance(event, logging.LogRecord):
+                        continue
                     else:
                         self.fail('Unexpected event: %s' % event)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]