From 62ad6660e00d1cee0de2a1f2c49fa38d8d2fc3c5 Mon Sep 17 00:00:00 2001 From: Julien Stephan Date: Thu, 16 Nov 2023 17:46:21 +0100 Subject: [PATCH] oeqa/selftest/devtool: fix test_devtool_modify_overrides test 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- 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 b5c488be8e..ab58971fec 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')