Skip to contentSkip to conversation

oe-selftest: devtool: fix test after recent change

PATCH New Paul Eggleton 1 participant 2 messages Aug 29, 2016

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover oe-selftest: devtool: fix test after recent change

The following changes since commit 00027aee12f4bbc9a4ba607c91fcc1e0e8257fa2:

core-image-kernel-dev.bb: Standardize use of _append and leading space. (2016-08-25 23:03:26 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/oe-selftest-devtool-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/oe-selftest-devtool-fix

Paul Eggleton (1):
oe-selftest: devtool: fix test after recent change

 meta/lib/oeqa/selftest/devtool.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Signature · 1 line
2.5.5
author
#1 lore raw

PATCH 1/1 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.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/lib/oeqa/selftest/devtool.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/lib/oeqa/selftest/devtool.py +3 -1
index 08fe8df..e992dcf 100644
@@ -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)
Signature · 1 line
2.5.5