shell: Optionally restrict commands' access with firejail

[lhc/web/wiklou.git] / tests / phpunit / includes / shell / CommandFactoryTest.php

diff --git a/tests/phpunit/includes/shell/CommandFactoryTest.php b/tests/phpunit/includes/shell/CommandFactoryTest.php
index aacfd43..bf0f65b 100644 (file)
--- a/tests/phpunit/includes/shell/CommandFactoryTest.php
+++ b/tests/phpunit/includes/shell/CommandFactoryTest.php
@@ -1,6 +1,8 @@
 <?php
 
+use MediaWiki\Shell\Command;
 use MediaWiki\Shell\CommandFactory;
+use MediaWiki\Shell\FirejailCommand;
 use Psr\Log\NullLogger;
 use Wikimedia\TestingAccessWrapper;
 
@@ -21,13 +23,25 @@ class CommandFactoryTest extends PHPUnit_Framework_TestCase {
                        'walltime' => 40,
                ];
 
-               $factory = new CommandFactory( $limits, $cgroup );
+               $factory = new CommandFactory( $limits, $cgroup, false );
                $factory->setLogger( $logger );
+               $factory->logStderr();
                $command = $factory->create();
+               $this->assertInstanceOf( Command::class, $command );
 
                $wrapper = TestingAccessWrapper::newFromObject( $command );
                $this->assertSame( $logger, $wrapper->logger );
                $this->assertSame( $cgroup, $wrapper->cgroup );
                $this->assertSame( $limits, $wrapper->limits );
+               $this->assertTrue( $wrapper->doLogStderr );
+       }
+
+       /**
+        * @covers MediaWiki\Shell\CommandFactory::create
+        */
+       public function testFirejailCreate() {
+               $factory = new CommandFactory( [], false, 'firejail' );
+               $factory->setLogger( new NullLogger() );
+               $this->assertInstanceOf( FirejailCommand::class, $factory->create() );
        }
 }