adapt regex for py_unit_adapter once more... hopefully we got all cases now.
This commit is contained in:
@ -1,6 +1,7 @@
|
|||||||
class PyUnitAdapter < TestingFrameworkAdapter
|
class PyUnitAdapter < TestingFrameworkAdapter
|
||||||
COUNT_REGEXP = /Ran (\d+) test/
|
COUNT_REGEXP = /Ran (\d+) test/
|
||||||
FAILURES_REGEXP = /FAILED \((failures|errors)=(\d+)\)/
|
FAILURES_REGEXP = /FAILED \(.*failures=(\d+).*\)/
|
||||||
|
ERRORS_REGEXP = /FAILED \(.*errors=(\d+).*\)/
|
||||||
ASSERTION_ERROR_REGEXP = /AssertionError:\s(.*)/
|
ASSERTION_ERROR_REGEXP = /AssertionError:\s(.*)/
|
||||||
|
|
||||||
def self.framework_name
|
def self.framework_name
|
||||||
@ -9,9 +10,11 @@ class PyUnitAdapter < TestingFrameworkAdapter
|
|||||||
|
|
||||||
def parse_output(output)
|
def parse_output(output)
|
||||||
count = COUNT_REGEXP.match(output[:stderr]).captures.first.to_i
|
count = COUNT_REGEXP.match(output[:stderr]).captures.first.to_i
|
||||||
matches = FAILURES_REGEXP.match(output[:stderr])
|
failures_matches = FAILURES_REGEXP.match(output[:stderr])
|
||||||
failed = matches ? matches.captures.try(:second).to_i : 0
|
failed = failures_matches ? failures_matches.captures.try(:first).to_i : 0
|
||||||
error_matches = ASSERTION_ERROR_REGEXP.match(output[:stderr]).try(:captures) || []
|
error_matches = ERRORS_REGEXP.match(output[:stderr])
|
||||||
{count: count, failed: failed, error_messages: error_matches}
|
errors = error_matches ? error_matches.captures.try(:first).to_i : 0
|
||||||
|
assertion_error_matches = ASSERTION_ERROR_REGEXP.match(output[:stderr]).try(:captures) || []
|
||||||
|
{count: count, failed: failed + errors, error_messages: assertion_error_matches}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user