From 3130c1a71f89046290d2f85501dddf26cb547bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= Date: Thu, 8 Aug 2013 09:02:40 +0200 Subject: [PATCH] MDL-40952 skip only the opcache requirement in environment test Please note we need other optional extensions and settings because otherwise some tests fail without explanation. --- lib/tests/environment_test.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/tests/environment_test.php b/lib/tests/environment_test.php index 748a3e0795d..64c508cae5c 100644 --- a/lib/tests/environment_test.php +++ b/lib/tests/environment_test.php @@ -33,8 +33,6 @@ class core_environment_testcase extends advanced_testcase { /** * Test the environment. - * - * @todo MDL-40952 will introduce a way to output something to the user to inform them this has failed. */ public function test_environment() { global $CFG; @@ -44,11 +42,12 @@ class core_environment_testcase extends advanced_testcase { $this->assertNotEmpty($envstatus); foreach ($environment_results as $environment_result) { - if ($environment_result->getLevel() === 'optional' && $environment_result->getStatus() === false) { - // An optional environment test has failed, we don't want to fail unit tests because of this. - // This was first detected with the opcache notice, see the to do in the phpdoc. - // We are going to fake the assertion count here so that people get consistent numbers. - $this->addToAssertionCount(1); + if ($environment_result->part === 'php_setting' + and $environment_result->info === 'opcache.enable' + and $environment_result->getLevel() === 'optional' + and $environment_result->getStatus() === false + ) { + $this->markTestSkipped('OPCache extension is not necessary for unit testing.'); continue; } $this->assertTrue($environment_result->getStatus(), "Problem detected in environment ($environment_result->part:$environment_result->info), fix all warnings and errors!");