[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2211/8267] oe-selftest: devtool: fix test after recent change



commit e5f61f85c550646bc7e26a1fe6d9df080864ef48
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Mon Aug 29 19:27:59 2016 +1200

    oe-selftest: devtool: fix test after recent change
    
    OE-Core commit d3057cba0b01484712fcee3c52373c143608a436 fixed handling
    of wildcard bbappends, which means that this test's expectations about
    the bbappend file name are no longer met. devtool finish is meant to use
    wildcard bbappends so fix the test accordingly.
    
    (From OE-Core rev: 21603566e4a2e709dcb4a940b49d870c91c822be)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/selftest/devtool.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 08fe8df..e992dcf 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -1331,7 +1331,9 @@ class DevtoolTests(DevtoolBase):
         result = runCmd('git status --porcelain .', cwd=recipedir)
         if result.output.strip():
             self.fail('Recipe directory for %s contains the following unexpected changes after finish:\n%s' 
% (recipe, result.output.strip()))
-        appendfile = os.path.join(appenddir, os.path.splitext(os.path.basename(oldrecipefile))[0] + 
'.bbappend')
+        recipefn = os.path.splitext(os.path.basename(oldrecipefile))[0]
+        recipefn = recipefn.split('_')[0] + '_%'
+        appendfile = os.path.join(appenddir, recipefn + '.bbappend')
         self.assertTrue(os.path.exists(appendfile), 'bbappend %s should have been created but wasn\'t' % 
appendfile)
         newdir = os.path.join(appenddir, recipe)
         files = os.listdir(newdir)


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