r113691 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r113690‎ | r113691 | r113692 >
Date:00:18, 13 March 2012
Author:aaron
Status:reverted
Tags:
Comment:
r113688: updated test assertions
Modified paths:
  • /trunk/phase3/tests/phpunit/includes/GlobalFunctions/GlobalTest.php (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
@@ -600,16 +600,16 @@
601601 global $wgPhpCli;
602602 return array(
603603 array( 'eval.php', array( '--help', '--test' ), array(),
604 - "'$wgPhpCli' 'eval.php' '--help' '--test'",
 604+ "$wgPhpCli eval.php '--help' '--test'",
605605 "Called eval.php --help --test" ),
606606 array( 'eval.php', array( '--help', '--test space' ), array('php' => 'php5'),
607 - "'php5' 'eval.php' '--help' '--test space'",
 607+ "php5 eval.php '--help' '--test space'",
608608 "Called eval.php --help --test with php option" ),
609609 array( 'eval.php', array( '--help', '--test', 'X' ), array('wrapper' => 'MWScript.php'),
610 - "'$wgPhpCli' 'MWScript.php' 'eval.php' '--help' '--test' 'X'",
 610+ "$wgPhpCli MWScript.php eval.php '--help' '--test' 'X'",
611611 "Called eval.php --help --test with wrapper option" ),
612612 array( 'eval.php', array( '--help', '--test', 'y' ), array('php' => 'php5', 'wrapper' => 'MWScript.php'),
613 - "'php5' 'MWScript.php' 'eval.php' '--help' '--test' 'y'",
 613+ "php5 MWScript.php eval.php '--help' '--test' 'y'",
614614 "Called eval.php --help --test with wrapper and php option" ),
615615 );
616616 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r114162Reverted r113688, r113691 per CR and filed #61440 upstream.aaron18:28, 19 March 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r113688Made wfShellMaintenanceCmd() not totally broken due to excess shell escaping.aaron00:05, 13 March 2012

Status & tagging log