[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3291/8267] oe-selftest: devtool: fix error message in _test_recipe_contents()



commit 7aebaa4204c89a60db5e6a691672849fcb392010
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Mon Oct 31 16:59:48 2016 +1300

    oe-selftest: devtool: fix error message in _test_recipe_contents()
    
    If a variable is being set in the recipe when we've explicitly passed
    None as the value to _test_recipe_contents() indicating that it
    shouldn't be set at all, then we should be printing out the variable
    name in the assertion message but it seems like I forgot to do a
    substitution. Also include the value for informational purposes.
    
    (From OE-Core rev: 0dafcb158003fb13f82c266f607d9967fca321db)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/selftest/devtool.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 713f2c5..71d205c 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -44,7 +44,7 @@ class DevtoolBase(oeSelfTest):
                 if var and var in checkvars:
                     needvalue = checkvars.pop(var)
                     if needvalue is None:
-                        self.fail('Variable %s should not appear in recipe')
+                        self.fail('Variable %s should not appear in recipe, but value is being set to "%s"' 
% (var, value))
                     if isinstance(needvalue, set):
                         if var == 'LICENSE':
                             value = set(value.split(' & '))


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