From: Richard Purdie Date: Tue, 9 Jul 2019 10:19:50 +0000 (+0100) Subject: oeqa/bbtests: Tweak test bitbake output pattern matching X-Git-Tag: uninative-2.7~848 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=78fcea74517de4793cc0ecc97bce7f5c7dcd44c0;p=openembedded-core.git oeqa/bbtests: Tweak test bitbake output pattern matching The output from bitbake will change slightly soon due to runqueue changes, adpat the test now to account for both the old and new cases. Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index 2a310bc4af..17da0fd32c 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -40,7 +40,7 @@ class BitbakeTests(OESelftestTestCase): def test_event_handler(self): self.write_config("INHERIT += \"test_events\"") result = bitbake('m4-native') - find_build_started = re.search(r"NOTE: Test for bb\.event\.BuildStarted(\n.*)*NOTE: Executing RunQueue Tasks", result.output) + find_build_started = re.search(r"NOTE: Test for bb\.event\.BuildStarted(\n.*)*NOTE: Executing.*Tasks", result.output) find_build_completed = re.search(r"Tasks Summary:.*(\n.*)*NOTE: Test for bb\.event\.BuildCompleted", result.output) self.assertTrue(find_build_started, msg = "Match failed in:\n%s" % result.output) self.assertTrue(find_build_completed, msg = "Match failed in:\n%s" % result.output)