From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 23 Sep 2011 22:17:41 +0000 (+0000)
Subject: Followup r97954: fix unit tests for wfShellMaintenanceCmd() to work on Unix as well... 
X-Git-Tag: 1.31.0-rc.0~27453
X-Git-Url: http://git.cyclocoop.org/data/modifier.php?a=commitdiff_plain;h=a6fa806eae3033c50085e3ea4f90e8ab062525de;p=lhc%2Fweb%2Fwiklou.git

Followup r97954: fix unit tests for wfShellMaintenanceCmd() to work on Unix as well as Windows
---

diff --git a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
index 011993ad13..b2b8448601 100644
--- a/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/GlobalTest.php
@@ -909,6 +909,10 @@ class GlobalTest extends MediaWikiTestCase {
 	 * @dataProvider provideWfShellMaintenanceCmdList
 	 */
 	function testWfShellMaintenanceCmd( $script, $parameters, $options, $expected, $description ) {
+		if( wfIsWindows() ) {
+			// Approximation that's good enough for our purposes just now
+			$expected = str_replace( "'", '"', $expected );
+		}
 		$actual = wfShellMaintenanceCmd( $script, $parameters, $options );
 		$this->assertEquals( $expected, $actual, $description );
 	}
@@ -917,16 +921,16 @@ class GlobalTest extends MediaWikiTestCase {
 		global $wgPhpCli;
 		return array(
 			array( 'eval.php', array( '--help', '--test' ), array(),
-				"\"$wgPhpCli\" \"eval.php\" \"--help\" \"--test\"",
+				"'$wgPhpCli' 'eval.php' '--help' '--test'",
 				"Called eval.php --help --test" ),
 			array( 'eval.php', array( '--help', '--test space' ), array('php' => 'php5'),
-				"\"php5\" \"eval.php\" \"--help\" \"--test space\"",
+				"'php5' 'eval.php' '--help' '--test space'",
 				"Called eval.php --help --test with php option" ),
 			array( 'eval.php', array( '--help', '--test', 'X' ), array('wrapper' => 'MWScript.php'),
-				"\"$wgPhpCli\" \"MWScript.php\" \"eval.php\" \"--help\" \"--test\" \"X\"",
+				"'$wgPhpCli' 'MWScript.php' 'eval.php' '--help' '--test' 'X'",
 				"Called eval.php --help --test with wrapper option" ),
 			array( 'eval.php', array( '--help', '--test', 'y' ), array('php' => 'php5', 'wrapper' => 'MWScript.php'),
-				"\"php5\" \"MWScript.php\" \"eval.php\" \"--help\" \"--test\" \"y\"",
+				"'php5' 'MWScript.php' 'eval.php' '--help' '--test' 'y'",
 				"Called eval.php --help --test with wrapper and php option" ),
 		);
 	}