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-22 00:31:49 +0100 |
commit | 63bea82d93a48c3dbc17477fb6b54a71ad4bc363 (patch) | |
tree | abc60013c7d827ef3ac6d3b9f38fb10cb60c6fee | |
parent | 7b1cbc340b066a4aac3cce3161879a02e93f63e2 (diff) | |
download | poky-63bea82d93a48c3dbc17477fb6b54a71ad4bc363.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: f1009d6d44097a3f140e2f8679e9184031b10b44)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
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 2deba6e932..65be679b43 100644 --- a/meta/lib/oeqa/core/runner.py +++ b/meta/lib/oeqa/core/runner.py | |||
@@ -106,13 +106,13 @@ class OETestResult(_TestResult): | |||
106 | 106 | ||
107 | # When fails at module or class level the class name is passed as string | 107 | # When fails at module or class level the class name is passed as string |
108 | # so figure out to see if match | 108 | # so figure out to see if match |
109 | m = re.search(r"^setUpModule \((?P<module_name>.*)\)$", scase_str) | 109 | m = re.search(r"^setUpModule \((?P<module_name>.*)\).*$", scase_str) |
110 | if m: | 110 | if m: |
111 | if case.__class__.__module__ == m.group('module_name'): | 111 | if case.__class__.__module__ == m.group('module_name'): |
112 | found = True | 112 | found = True |
113 | break | 113 | break |
114 | 114 | ||
115 | m = re.search(r"^setUpClass \((?P<class_name>.*)\)$", scase_str) | 115 | m = re.search(r"^setUpClass \((?P<class_name>.*)\).*$", scase_str) |
116 | if m: | 116 | if m: |
117 | class_name = "%s.%s" % (case.__class__.__module__, | 117 | class_name = "%s.%s" % (case.__class__.__module__, |
118 | case.__class__.__name__) | 118 | case.__class__.__name__) |