Revert "selftest: fixed filter to know about a "error" result"
authorAndrew Tridgell <tridge@samba.org>
Mon, 19 Oct 2009 03:17:02 +0000 (14:17 +1100)
committerAndrew Tridgell <tridge@samba.org>
Mon, 19 Oct 2009 03:17:02 +0000 (14:17 +1100)
This reverts commit 1de7e43fb4a4863e3663af8b2a2d9f19cf82d7f3.

This is much more delicate than it seems

selftest/Subunit/Filter.pm

index 2b390d189a8ed80ec672c06465336dbbde8399f8..93b690df8ee7c5db4b1263480c3f8bb56a5e2918 100644 (file)
@@ -76,12 +76,6 @@ sub start_test($$)
        Subunit::start_test($testname);
 }
 
        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) = @_;
 sub end_test($$$$$)
 {
        my ($self, $testname, $result, $unexpected, $reason) = @_;
@@ -90,12 +84,12 @@ sub end_test($$$$$)
                $testname = $self->{prefix}.$testname;
        }
 
                $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);
                $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;
                $result = "xfail";
                $self->{xfail_added}++;
                $reason .= $xfail_reason;
@@ -127,7 +121,7 @@ sub start_testsuite($;$)
 sub end_testsuite($$;$)
 {
        my ($self, $name, $result, $reason) = @_;
 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";
        }
                
                $result = "xfail";
        }