[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6839/8267] oe-pkgdata-util: Setup logging before calling prepare



commit ac4682fc9cc3b7dd0f3f0201f5710e62890cd9c0
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Wed Jul 19 15:24:39 2017 +0100

    oe-pkgdata-util: Setup logging before calling prepare
    
    This avoids test failures like:
    
    INFO - ======================================================================
    INFO - FAIL [1.046s]: test_find_path (pkgdata.OePkgdataUtilTests)
    INFO - ----------------------------------------------------------------------
    INFO - Traceback (most recent call last):
      File "/media/build1/poky/meta/lib/oeqa/core/decorator/__init__.py", line 32, in wrapped_f
        return func(*args, **kwargs)
      File "/media/build1/poky/meta/lib/oeqa/selftest/cases/pkgdata.py", line 50, in test_find_path
        self.assertEqual(result.output, 'zlib: /lib/libz.so.1')
    AssertionError: 'NOTE: Starting bitbake server...\nzlib: /lib/libz.so.1' != 'zlib: /lib/libz.so.1'
    - NOTE: Starting bitbake server...
      zlib: /lib/libz.so.1
    INFO - ----------------------------------------------------------------------
    
    since there is corruption in the output. Setting the logging up before
    calling tinfoil.prepare() resolves this.
    
    (From OE-Core rev: 39c1bf1feccc8dca57160a1e3cd8a50e8c30ef02)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/oe-pkgdata-util |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index 677effe..a690870 100755
--- a/scripts/oe-pkgdata-util
+++ b/scripts/oe-pkgdata-util
@@ -40,9 +40,8 @@ def tinfoil_init():
     import bb.tinfoil
     import logging
     tinfoil = bb.tinfoil.Tinfoil()
-    tinfoil.prepare(True)
-
     tinfoil.logger.setLevel(logging.WARNING)
+    tinfoil.prepare(True)
     return tinfoil
 
 


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