* (bug 19957) All known-failing tests now marked disabled; added --run-disabled optio...

Based on Dan Nessett's patch set.
I put back one of the test cases which does, in fact, work at least on my config. :)

diff --git a/CREDITS b/CREDITS
index c645a2b..df88b0b 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -65,6 +65,7 @@ following names for their contribution to the product.
 * Carlin
 * Chris Wrinn
 * church of emacs
+* Dan Nessett
 * Daniel Arnold
 * Danny B.
 * Derk-Jan Hartman

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b0fd39d..8ba8d00 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -346,6 +346,8 @@ this. Was used when mwEmbed was going to be an extension.
 * (bug 17988) Spaces before [[Category:]] links are no longer ignored
 * (bug 19392) Favicon, apple-touch-icon links matching the defaults are no 
   longer sent
+* (bug 19957) All known-failing tests now marked disabled; added --run-disabled
+  option to parser test suite to run disabled tests if desired.
 
 == API changes in 1.16 ==
 

diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index a5b7ed5..d76a575 100644 (file)
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -25,7 +25,7 @@
  */
 
 /** */
-$options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record' );
+$options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record'. 'run-disabled' );
 $optionsWithArgs = array( 'regex', 'seed', 'setversion' );
 
 require_once( 'commandLine.inc' );
@@ -125,6 +125,8 @@ class ParserTest {
                        $this->fuzzSeed = intval( $options['seed'] ) - 1;
                }
 
+               $this->runDisabled = isset( $options['run-disabled'] );
+
                $this->hooks = array();
                $this->functionHooks = array();
        }
@@ -356,8 +358,8 @@ class ParserTest {
                                        if (!isset( $data['config'] ) )
                                                $data['config'] = '';
                                        
-                                       if (preg_match('/\\bdisabled\\b/i', $data['options'])
-                                               || !preg_match("/{$this->regex}/i", $data['test'])) {
+                                       if ( (preg_match('/\\bdisabled\\b/i', $data['options'])
+                                               || !preg_match("/{$this->regex}/i", $data['test'])) && !$this->runDisabled ) {
                                                # disabled test
                                                $data = array();
                                                $section = null;

diff --git a/maintenance/parserTests.php b/maintenance/parserTests.php
index c7e2260..41f5d73 100644 (file)
--- a/maintenance/parserTests.php
+++ b/maintenance/parserTests.php
@@ -46,6 +46,7 @@ Options:
   --fuzz           Do a fuzz test instead of a normal test
   --seed <n>       Start the fuzz test from the specified seed
   --help           Show this help message
+  --run-disabled   run disabled tests
 
 
 ENDS;

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 824eb74..067dbe6 100644 (file)
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -1271,6 +1271,8 @@ Invalid attributes in table cell (bug 1830)
 # specified here is now valid XML, which is an improvement . . .
 !! test
 Table security: embedded pipes (http://lists.wikimedia.org/mailman/htdig/wikitech-l/2006-April/022293.html)
+!! options
+disabled
 !! input
 {|
 | |[ftp://|x||]" onmouseover="alert(document.cookie)">test
@@ -1471,6 +1473,8 @@ Link containing "<#" and ">#" as hex sequences
 
 !! test
 Link containing double-single-quotes '' (bug 4598)
+!! options
+disabled
 !! input
 [[Lista d''e paise d''o munno]]
 !! result
@@ -4787,6 +4791,8 @@ HTML bullet list, closed tags (bug 5497)
 
 !! test
 HTML bullet list, unclosed tags (bug 5497)
+!! options
+disabled
 !! input
 <ul>
 <li>One
@@ -4817,6 +4823,8 @@ HTML ordered list, closed tags (bug 5497)
 
 !! test
 HTML ordered list, unclosed tags (bug 5497)
+!! options
+disabled
 !! input
 <ol>
 <li>One
@@ -4857,6 +4865,8 @@ HTML nested bullet list, closed tags (bug 5497)
 
 !! test
 HTML nested bullet list, open tags (bug 5497)
+!! options
+disabled
 !! input
 <ul>
 <li>One
@@ -4905,6 +4915,8 @@ HTML nested ordered list, closed tags (bug 5497)
 
 !! test
 HTML nested ordered list, open tags (bug 5497)
+!! options
+disabled
 !! input
 <ol>
 <li>One
@@ -5221,6 +5233,8 @@ New wiki paragraph
 
 !! test
 Inline HTML vs wiki block nesting
+!! options
+disabled
 !! input
 <b>Bold paragraph
 
@@ -6404,6 +6418,8 @@ Another italics / bold test
 # ...<dd> </dt></dl> </dd...
 !! test
 dt/dd/dl test
+!! options
+disabled
 !! input
 :;;;::
 !! result
@@ -6421,6 +6437,8 @@ dt/dd/dl test
 # Images with the "|" character in external URLs in comment tags; Eats half the comment, leaves unmatched "</a>" tag.
 !! test
 Images with the "|" character in the comment
+!! options
+disabled
 !! input
 [[image:Foobar.jpg|thumb|An [http://test/?param1=|left|&param2=|x external] URL]]
 !! result
@@ -7093,6 +7111,8 @@ Line two
 # Bug 6200: <blockquote> should behave like <div> with respect to line breaks
 !! test
 Bug 6200: paragraphs inside blockquotes (no extra line breaks)
+!! options
+disabled
 !! input
 <blockquote>Line one
 
@@ -7105,6 +7125,8 @@ Line two</blockquote>
 
 !! test
 Bug 6200: paragraphs inside blockquotes (extra line break on open)
+!! options
+disabled
 !! input
 <blockquote>
 Line one
@@ -7120,6 +7142,8 @@ Line two</blockquote>
 
 !! test
 Bug 6200: paragraphs inside blockquotes (extra line break on close)
+!! options
+disabled
 !! input
 <blockquote>Line one
 
@@ -7135,6 +7159,8 @@ Line two
 
 !! test
 Bug 6200: paragraphs inside blockquotes (extra line break on open and close)
+!! options
+disabled
 !! input
 <blockquote>
 Line one