X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fshell%2FCommandTest.php;h=385dd500a6baa319d642a5243381e2c02dde8509;hb=9c478b51e3b038b66d3825e6f112c158bea95b9e;hp=32d855ea39198c8901bbb2ce75a6200b9118e126;hpb=fe77ef31d5d6d2dd57a66f16d015e395014fb23c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/shell/CommandTest.php b/tests/phpunit/includes/shell/CommandTest.php
index 32d855ea39..385dd500a6 100644
--- a/tests/phpunit/includes/shell/CommandTest.php
+++ b/tests/phpunit/includes/shell/CommandTest.php
@@ -1,8 +1,10 @@
 <?php
 
 use MediaWiki\Shell\Command;
+use Wikimedia\TestingAccessWrapper;
 
 /**
+ * @covers \MediaWiki\Shell\Command
  * @group Shell
  */
 class CommandTest extends PHPUnit_Framework_TestCase {
@@ -103,6 +105,16 @@ class CommandTest extends PHPUnit_Framework_TestCase {
 		$this->assertRegExp( '/^.+no-such-file.*$/m', $result->getStderr() );
 	}
 
+	/**
+	 * Test that null values are skipped by params() and unsafeParams()
+	 */
+	public function testNullsAreSkipped() {
+		$command = TestingAccessWrapper::newFromObject( new Command );
+		$command->params( 'echo', 'a', null, 'b' );
+		$command->unsafeParams( 'c', null, 'd' );
+		$this->assertEquals( "'echo' 'a' 'b' c d", $command->command );
+	}
+
 	public function testT69870() {
 		$commandLine = wfIsWindows()
 			// 333 = 331 + CRLF
@@ -118,4 +130,25 @@ class CommandTest extends PHPUnit_Framework_TestCase {
 			$this->assertEquals( 333333, strlen( $output ) );
 		}
 	}
+
+	public function testLogStderr() {
+		$this->requirePosix();
+
+		$logger = new TestLogger( true, function ( $message, $level, $context ) {
+			return $level === Psr\Log\LogLevel::ERROR ? '1' : null;
+		}, true );
+		$command = new Command();
+		$command->setLogger( $logger );
+		$command->params( 'bash', '-c', 'echo ThisIsStderr 1>&2' );
+		$command->execute();
+		$this->assertEmpty( $logger->getBuffer() );
+
+		$command = new Command();
+		$command->setLogger( $logger );
+		$command->logStderr();
+		$command->params( 'bash', '-c', 'echo ThisIsStderr 1>&2' );
+		$command->execute();
+		$this->assertSame( 1, count( $logger->getBuffer() ) );
+		$this->assertSame( trim( $logger->getBuffer()[0][2]['error'] ), 'ThisIsStderr' );
+	}
 }