[oe-commits] Richard Purdie : oeqa/selftest/recipetool: Fix appendfile_binary test on opensuse131
git at git.openembedded.org
git at git.openembedded.org
Fri Jun 26 13:02:09 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 792107de1586336f4a734557c0c3fa36a1174e9e
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=792107de1586336f4a734557c0c3fa36a1174e9e
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Thu Jun 25 16:47:28 2015 +0100
oeqa/selftest/recipetool: Fix appendfile_binary test on opensuse131
On OpenSUSE 13.1, /bin/ls is a symlink to /usr/bin/ls. This means the
test doesn't use a binary file an fails on that system.
Ensure we resolve any symlink using readlink to avoid this failure.
======================================================================
FAIL: test_recipetool_appendfile_binary (oeqa.selftest.recipetool.RecipetoolTests)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/recipetool.py", line 115, in test_recipetool_appendfile_binary
self.assertIn('WARNING: ', result.output)
AssertionError: 'WARNING: ' not found in 'Parsing recipes..done.\nNOTE: Writing append file /tmp/recipetoolqai0NY8l/recipes-core/coreutils/coreutils_8.23.bbappend\nNOTE: Copying /bin/ls to /tmp/recipetoolqai0NY8l/recipes-core/coreutils/coreutils/ls'
[YOCTO #7920]
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oeqa/selftest/recipetool.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py
index f3ad493..c08b2e4 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/meta/lib/oeqa/selftest/recipetool.py
@@ -111,7 +111,9 @@ class RecipetoolTests(DevtoolBase):
def test_recipetool_appendfile_binary(self):
# Try appending a binary file
- result = runCmd('recipetool appendfile %s /bin/ls /bin/ls -r coreutils' % templayerdir)
+ # /bin/ls can be a symlink to /usr/bin/ls
+ ls = os.readlink("/bin/ls")
+ result = runCmd('recipetool appendfile %s /bin/ls %s -r coreutils' % (templayerdir, ls))
self.assertIn('WARNING: ', result.output)
self.assertIn('is a binary', result.output)
More information about the Openembedded-commits
mailing list