From: Julien Stephan Date: Thu, 16 Nov 2023 16:46:21 +0000 (+0100) Subject: oeqa/selftest/devtool: fix test_devtool_modify_overrides test X-Git-Tag: uninative-4.4~1007 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe03789d9555c025316325b559bbde40d5e770a8;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git 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 Signed-off-by: Julien Stephan Signed-off-by: Alexandre Belloni --- 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')