From: Adrian Freihofer <[email protected]> Replace strict string matching with assertRegex to allow for flexible whitespace in the "Fail: 0" output from meson tests. This improves test robustness against formatting changes. This issue was discovered with scarthgap.
Signed-off-by: Adrian Freihofer <[email protected]> --- meta/lib/oeqa/selftest/cases/devtool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 297dda7457..dc83d406fd 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -2911,7 +2911,7 @@ class DevtoolIdeSdkTests(DevtoolBase): result = runCmd('%s test -C %s' % (meson_exe, build_dir), cwd=tempdir, output_log=self._cmd_logger) self.assertEqual(result.status, 0) - self.assertIn("Fail: 0", result.output) + self.assertRegex(result.output, r"Fail:\s+0") # Verify re-building and testing works again result = runCmd('%s compile -C %s --clean' % (meson_exe, build_dir), @@ -2922,7 +2922,7 @@ class DevtoolIdeSdkTests(DevtoolBase): result = runCmd('%s test -C %s' % (meson_exe, build_dir), cwd=tempdir, output_log=self._cmd_logger) self.assertEqual(result.status, 0) - self.assertIn("Fail: 0", result.output) + self.assertRegex(result.output, r"Fail:\s+0") return compile_cmd -- 2.53.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#233438): https://lists.openembedded.org/g/openembedded-core/message/233438 Mute This Topic: https://lists.openembedded.org/mt/118391916/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
