X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fshell%2FFirejailCommandTest.php;h=681c3dcda019dc03ca2b4154041dd1c885c011a7;hb=f17f841a9dfa1bee3f8ed47a09f06d1226452573;hp=7d6d7f817d105fe83f7a63c160160aca811aea14;hpb=51615ecf47528d1011ce6fefb1544073a07bdebc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/shell/FirejailCommandTest.php b/tests/phpunit/includes/shell/FirejailCommandTest.php
index 7d6d7f817d..681c3dcda0 100644
--- a/tests/phpunit/includes/shell/FirejailCommandTest.php
+++ b/tests/phpunit/includes/shell/FirejailCommandTest.php
@@ -23,16 +23,18 @@ use MediaWiki\Shell\FirejailCommand;
 use MediaWiki\Shell\Shell;
 use Wikimedia\TestingAccessWrapper;
 
-class FirejailCommandTest extends PHPUnit_Framework_TestCase {
+class FirejailCommandTest extends PHPUnit\Framework\TestCase {
+
+	use MediaWikiCoversValidator;
+
 	public function provideBuildFinalCommand() {
 		global $IP;
-		// @codingStandardsIgnoreStart
+		// phpcs:ignore Generic.Files.LineLength
 		$env = "'MW_INCLUDE_STDERR=;MW_CPU_LIMIT=180; MW_CGROUP='\'''\''; MW_MEM_LIMIT=307200; MW_FILE_SIZE_LIMIT=102400; MW_WALL_CLOCK_LIMIT=180; MW_USE_LOG_PIPE=yes'";
-		// @codingStandardsIgnoreEnd
 		$limit = "/bin/bash '$IP/includes/shell/limit.sh'";
 		$profile = "--profile=$IP/includes/shell/firejail.profile";
 		$blacklist = '--blacklist=' . realpath( MW_CONFIG_FILE );
-		$default = "$blacklist --noroot --seccomp=@default --private-dev";
+		$default = "$blacklist --noroot --seccomp --private-dev";
 		return [
 			[
 				'No restrictions',
@@ -56,12 +58,12 @@ class FirejailCommandTest extends PHPUnit_Framework_TestCase {
 			[
 				'seccomp',
 				'ls', Shell::SECCOMP,
-				"$limit 'firejail --quiet $profile --seccomp=@default -- '\''ls'\''' $env"
+				"$limit 'firejail --quiet $profile --seccomp -- '\''ls'\''' $env"
 			],
 			[
 				'seccomp & no execve',
 				'ls', Shell::SECCOMP | Shell::NO_EXECVE,
-				"$limit 'firejail --quiet $profile --shell=none --seccomp=@default,execve -- '\''ls'\''' $env"
+				"$limit 'firejail --quiet $profile --shell=none --seccomp=execve -- '\''ls'\''' $env"
 			],
 		];
 	}