diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-09 14:33:37 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-12 09:04:26 +0100 |
commit | 52f1b4050baa517c4accae230e8b06cc37465f1c (patch) | |
tree | 56233b1a795d8f3fa7101b68380c8b23aac33adc | |
parent | 61721169541821359b222aceedda11355a6137fd (diff) | |
download | poky-52f1b4050baa517c4accae230e8b06cc37465f1c.tar.gz |
oeqa/runner: Fix subunit setupClass/setupModule failure handling
The string format for subunit setupClass/setupModule failures is slightly
different, tweak the regex to correctly handle both cases.
(From OE-Core rev: 425fbba9348420df72de5c6292f50acaf2023d0b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/core/runner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py index ca61de8cc0..930620ea19 100644 --- a/meta/lib/oeqa/core/runner.py +++ b/meta/lib/oeqa/core/runner.py | |||
@@ -109,13 +109,13 @@ class OETestResult(_TestResult): | |||
109 | 109 | ||
110 | # When fails at module or class level the class name is passed as string | 110 | # When fails at module or class level the class name is passed as string |
111 | # so figure out to see if match | 111 | # so figure out to see if match |
112 | m = re.search(r"^setUpModule \((?P<module_name>.*)\)$", scase_str) | 112 | m = re.search(r"^setUpModule \((?P<module_name>.*)\).*$", scase_str) |
113 | if m: | 113 | if m: |
114 | if case.__class__.__module__ == m.group('module_name'): | 114 | if case.__class__.__module__ == m.group('module_name'): |
115 | found = True | 115 | found = True |
116 | break | 116 | break |
117 | 117 | ||
118 | m = re.search(r"^setUpClass \((?P<class_name>.*)\)$", scase_str) | 118 | m = re.search(r"^setUpClass \((?P<class_name>.*)\).*$", scase_str) |
119 | if m: | 119 | if m: |
120 | class_name = "%s.%s" % (case.__class__.__module__, | 120 | class_name = "%s.%s" % (case.__class__.__module__, |
121 | case.__class__.__name__) | 121 | case.__class__.__name__) |