]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/bbtests: Tweak test bitbake output pattern matching
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 9 Jul 2019 10:19:50 +0000 (11:19 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 9 Jul 2019 22:29:31 +0000 (23:29 +0100)
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 <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/selftest/cases/bbtests.py

index 2a310bc4af20a4b2916d0a46285b2a38acc12dfd..17da0fd32c76c98087c702f31984f21ff51881f6 100644 (file)
@@ -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)