Author: jelmer Date: 2007-08-27 00:38:42 +0000 (Mon, 27 Aug 2007) New Revision: 24692
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24692 Log: Color expected fialures orange rather than green. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/selftest/output/html.pm branches/SAMBA_4_0/source/selftest/output/testresults.css Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/selftest/output/html.pm =================================================================== --- branches/SAMBA_4_0/source/selftest/output/html.pm 2007-08-27 00:36:26 UTC (rev 24691) +++ branches/SAMBA_4_0/source/selftest/output/html.pm 2007-08-27 00:38:42 UTC (rev 24692) @@ -128,7 +128,11 @@ my $st = $self->{local_statistics}; if ($ret == $expected_ret) { - print INDEX " <td class=\"resultOk\">"; + if ($ret == 0) { + print INDEX " <td class=\"resultExpectedFailure\">"; + } else { + print INDEX " <td class=\"resultOk\">"; + } } else { print INDEX " <td class=\"resultFailure\">"; } @@ -196,7 +200,11 @@ $track_class = "unexpected_$result"; } } else { - print TEST "<td class=\"outputOk\">\n"; + if ($result eq "failure") { + print TEST "<td class=\"outputExpectedFailure\">\n"; + } else { + print TEST "<td class=\"outputOk\">\n"; + } $track_class = "expected_$result"; } @@ -238,9 +246,11 @@ if ($st->{TESTS_SKIP} > 0) { print INDEX ", $st->{TESTS_SKIP} skipped"; } - print INDEX ", " . ($st->{TESTS_UNEXPECTED_FAIL} + $st->{TESTS_EXPECTED_FAIL}) . " failures"; - if ($st->{TESTS_UNEXPECTED_OK} > 0) { - print INDEX " ($st->{TESTS_EXPECTED_FAIL} expected)"; + if (($st->{TESTS_UNEXPECTED_FAIL} + $st->{TESTS_EXPECTED_FAIL}) > 0) { + print INDEX ", " . ($st->{TESTS_UNEXPECTED_FAIL} + $st->{TESTS_EXPECTED_FAIL}) . " failures"; + if ($st->{TESTS_UNEXPECTED_FAIL} > 0) { + print INDEX " ($st->{TESTS_EXPECTED_FAIL} expected)"; + } } if ($st->{TESTS_ERROR} > 0) { print INDEX ", $st->{TESTS_ERROR} errors"; Modified: branches/SAMBA_4_0/source/selftest/output/testresults.css =================================================================== --- branches/SAMBA_4_0/source/selftest/output/testresults.css 2007-08-27 00:36:26 UTC (rev 24691) +++ branches/SAMBA_4_0/source/selftest/output/testresults.css 2007-08-27 00:38:42 UTC (rev 24692) @@ -56,6 +56,16 @@ font-weight: bold; } +/* Expected failure */ +td.resultExpectedFailure +{ + text-align: right; + padding-left: 10px; + padding-right: 10px; + background-color: #FFA500; + font-weight: bold; +} + /* Skipped */ td.resultSkipped { @@ -91,6 +101,11 @@ background-color: #FF0000; } +td.outputExpectedFailure +{ + background-color: #FFA500; +} + div.reason { text-align: center;
