mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/selftest/devtool: fix test_devtool_modify_overrides test

Browse Source 
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

(From OE-Core rev: fe03789d9555c025316325b559bbde40d5e770a8)

Signed-off-by: Julien Stephan <jstephan@baylibre.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Julien Stephan
2023-11-16 17:46:21 +01:00
committed by Richard Purdie
parent 9b8c59b165
commit 62ad6660e0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/cases/devtool.py
+6 -1
View File
@@ -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')