This test fails for machines qemuarm and qemux86 because when doing
devtool modify, the default devtool branch contains the patch that match
the current configuration, so for both qemuarm and qemux86 machines the
corresponding override patch is applied and we get the following error
(for qemuarm machine):
AssertionError: 'This is a test for qemuarm\n' != 'This is a test for
something\n'
- This is a test for qemuarm
? ^ ^^^^^
+ This is a test for something
? ^^^ ^^^^^
Fix the test by looking at the correct value depending on the current
machine configuration
Signed-off-by: Julien Stephan <jstep...@baylibre.com>
---
meta/lib/oeqa/selftest/cases/devtool.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py
b/meta/lib/oeqa/selftest/cases/devtool.py
index b5c488be8e8..ab58971fec7 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1075,7 +1075,12 @@ class DevtoolModifyTests(DevtoolBase):
with open(source, "rt") as f:
content = f.read()
self.assertEquals(content, expected)
- check('devtool', 'This is a test for something\n')
+ if self.td["MACHINE"] == "qemux86":
+ check('devtool', 'This is a test for qemux86\n')
+ elif self.td["MACHINE"] == "qemuarm":
+ check('devtool', 'This is a test for qemuarm\n')
+ else:
+ check('devtool', 'This is a test for something\n')
check('devtool-no-overrides', 'This is a test for something\n')
check('devtool-override-qemuarm', 'This is a test for qemuarm\n')
check('devtool-override-qemux86', 'This is a test for qemux86\n')
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190805):
https://lists.openembedded.org/g/openembedded-core/message/190805
Mute This Topic: https://lists.openembedded.org/mt/102630190/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
