]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
oeqa/runner: Fix subunit setupClass/setupModule failure handling
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 9 May 2019 13:33:37 +0000 (14:33 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 9 May 2019 15:32:16 +0000 (16:32 +0100)
The string format for subunit setupClass/setupModule failures is slightly
different, tweak the regex to correctly handle both cases.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/core/runner.py

index ca61de8cc0aeecd53f2ed17ec438168bfbf8660c..930620ea19fef33ec675fe440f67330749d331be 100644 (file)
@@ -109,13 +109,13 @@ class OETestResult(_TestResult):
 
                 # When fails at module or class level the class name is passed as string
                 # so figure out to see if match
-                m = re.search(r"^setUpModule \((?P<module_name>.*)\)$", scase_str)
+                m = re.search(r"^setUpModule \((?P<module_name>.*)\).*$", scase_str)
                 if m:
                     if case.__class__.__module__ == m.group('module_name'):
                         found = True
                         break
 
-                m = re.search(r"^setUpClass \((?P<class_name>.*)\)$", scase_str)
+                m = re.search(r"^setUpClass \((?P<class_name>.*)\).*$", scase_str)
                 if m:
                     class_name = "%s.%s" % (case.__class__.__module__,
                                             case.__class__.__name__)