[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  38fbfdc... Revert "selftest: fixed filter to know about a "error" result"
      from  fb9319d... s4-selftest: move secdesc.python test to skip list

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 38fbfdca4d4234875f15571f7c90eff0078b6b2c
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Oct 19 14:17:02 2009 +1100

    Revert "selftest: fixed filter to know about a "error" result"
    
    This reverts commit 1de7e43fb4a4863e3663af8b2a2d9f19cf82d7f3.
    
    This is much more delicate than it seems

-----------------------------------------------------------------------

Summary of changes:
 selftest/Subunit/Filter.pm |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/Subunit/Filter.pm b/selftest/Subunit/Filter.pm
index 2b390d1..93b690d 100644
--- a/selftest/Subunit/Filter.pm
+++ b/selftest/Subunit/Filter.pm
@@ -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";
 	}
 		


-- 
Samba Shared Repository