Patchwork selftest/bbtests.py: Fixed regex and added bitbake output to test_warnings_errors

login
register
mail settings
Submitter Corneliu Stoicescu
Date March 26, 2014, 4:48 p.m.
Message ID <1395852491-32086-1-git-send-email-corneliux.stoicescu@intel.com>
Download mbox | patch
Permalink /patch/69305/
State New
Headers show

Comments

Alexandru Palalau - March 26, 2014, 4:33 p.m.
Hi,
On 3/26/2014 6:48 PM, Corneliu Stoicescu wrote:
> The test failed when more than 1 error or 1 warning is present.
> Also pasting the bitbake output when the test fails.
>
> Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com>
> ---
>   meta/lib/oeqa/selftest/bbtests.py | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py
> index ee1f82a..d7dc127 100644
> --- a/meta/lib/oeqa/selftest/bbtests.py
> +++ b/meta/lib/oeqa/selftest/bbtests.py
> @@ -47,10 +47,10 @@ class BitbakeTests(oeSelfTest):
>
>       def test_warnings_errors(self):
>           result = bitbake('-b asdf', ignore_status=True)
> -        find_warnings = re.search("Summary: There was [1-9][0-9]* WARNING message shown.", result.output)
> -        find_errors = re.search("Summary: There was [1-9][0-9]* ERROR message shown.", result.output)
> -        self.assertTrue(find_warnings)
> -        self.assertTrue(find_errors)
> +        find_warnings = re.search("Summary: There wa.{1,2}? [1-9][0-9]* WARNING messages* shown", result.output)
> +        find_errors = re.search("Summary: There wa.{1,2}? [1-9][0-9]* ERROR messages* shown", result.output)
If more than one warning messages are encountered, the actual output is 
"Summary: There were 2 WARNING messages shown." and the search above 
doesn't match.
> +        self.assertTrue(find_warnings, msg="Did not find the mumber of warnings at the end of the build:\n" + result.output)
> +        self.assertTrue(find_errors, msg="Did not find the mumber of errors at the end of the build:\n" + result.output)
>
>       def test_invalid_patch(self):
>           self.write_recipeinc('man', 'SRC_URI += "file://man-1.5h1-make.patch"')
>
Corneliu Stoicescu - March 26, 2014, 4:48 p.m.
The test failed when more than 1 error or 1 warning is present.
Also pasting the bitbake output when the test fails.

Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com>
---
 meta/lib/oeqa/selftest/bbtests.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py
index ee1f82a..d7dc127 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -47,10 +47,10 @@  class BitbakeTests(oeSelfTest):
 
     def test_warnings_errors(self):
         result = bitbake('-b asdf', ignore_status=True)
-        find_warnings = re.search("Summary: There was [1-9][0-9]* WARNING message shown.", result.output)
-        find_errors = re.search("Summary: There was [1-9][0-9]* ERROR message shown.", result.output)
-        self.assertTrue(find_warnings)
-        self.assertTrue(find_errors)
+        find_warnings = re.search("Summary: There wa.{1,2}? [1-9][0-9]* WARNING messages* shown", result.output)
+        find_errors = re.search("Summary: There wa.{1,2}? [1-9][0-9]* ERROR messages* shown", result.output)
+        self.assertTrue(find_warnings, msg="Did not find the mumber of warnings at the end of the build:\n" + result.output)
+        self.assertTrue(find_errors, msg="Did not find the mumber of errors at the end of the build:\n" + result.output)
 
     def test_invalid_patch(self):
         self.write_recipeinc('man', 'SRC_URI += "file://man-1.5h1-make.patch"')