sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Revert "selftest: fixed filter to know about a "error" result"

Browse Source 
This reverts commit 1de7e43fb4a4863e3663af8b2a2d9f19cf82d7f3.

This is much more delicate than it seems
This commit is contained in:
Andrew Tridgell 2009-10-19 14:17:02 +11:00
parent fb9319d971
commit 38fbfdca4d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
selftest/Subunit/Filter.pm
View File

@ -76,12 +76,6 @@ sub start_test($$)
Subunit::start_test($testname);
}
sub is_failure($)
{
my ($result) = @_;
return $result eq "fail" or $result eq "failure" or $result eq "error";
}
sub end_test($$$$$)
{
my ($self, $testname, $result, $unexpected, $reason) = @_;
@ -90,12 +84,12 @@ sub end_test($$$$$)
$testname = $self->{prefix}.$testname;
}
if (is_failure($result) and not $unexpected) {
if (($result eq "fail" or $result eq "failure") and not $unexpected) {
$result = "xfail";
$self->{xfail_added}++;
}
my $xfail_reason = find_in_list($self->{expected_failures}, $testname);
if (defined($xfail_reason) and is_failure($result)) {
if (defined($xfail_reason) and ($result eq "fail" or $result eq "failure")) {
$result = "xfail";
$self->{xfail_added}++;
$reason .= $xfail_reason;
@ -127,7 +121,7 @@ sub start_testsuite($;$)
sub end_testsuite($$;$)
{
my ($self, $name, $result, $reason) = @_;
if ($self->{xfail_added} and is_failure($result)) {
if ($self->{xfail_added} and ($result eq "fail" or $result eq "failure")) {
$result = "xfail";
}