From: Chen Qi Date: Wed, 1 Jul 2020 05:50:10 +0000 (+0800) Subject: oescripts: ignore whitespaces when comparing lines X-Git-Tag: 2020-04.2-dunfell~48 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=80bdd59c8fa8b20a5a1fe7b5e3f1ddb95ad13af6;p=openembedded-core.git oescripts: ignore whitespaces when comparing lines list-packageconfig-flags.py determines the whitespace numbers according to the longest package name. This is reasonable for the tool as it's trying to generate pretty output. However, in this selftest case, the output is hardcoded. This results in "pinentry gtk2 libcap ncurses qt secret" not recognized as correct as the expected line is: "pinentry gtk2 libcap ncurses qt secret". The difference is only about whitespaces. So we should ignore the whitespaces when comparing lines. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie (cherry picked from commit 17c89ad1596dbc7cefdd2c01dcd95aa9e93c5dc6) Signed-off-by: Steve Sakoman --- diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index f697d29b50..726daff7c6 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -133,7 +133,7 @@ class OEListPackageconfigTests(OEScriptTests): def check_endlines(self, results, expected_endlines): for line in results.output.splitlines(): for el in expected_endlines: - if line == el: + if line.split() == el.split(): expected_endlines.remove(el) break