X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fshell%2FFirejailCommandTest.php;h=681c3dcda019dc03ca2b4154041dd1c885c011a7;hp=15853753c154bc142409736ca9c975c20482de35;hb=f17f841a9dfa1bee3f8ed47a09f06d1226452573;hpb=07a791ffd1d80c6a8f2ca4dfdbc3f2002ac869fe diff --git a/tests/phpunit/includes/shell/FirejailCommandTest.php b/tests/phpunit/includes/shell/FirejailCommandTest.php index 15853753c1..681c3dcda0 100644 --- a/tests/phpunit/includes/shell/FirejailCommandTest.php +++ b/tests/phpunit/includes/shell/FirejailCommandTest.php @@ -23,7 +23,7 @@ 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; @@ -34,7 +34,7 @@ class FirejailCommandTest extends PHPUnit_Framework_TestCase { $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', @@ -58,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" ], ]; }