Merge "Avoid running of hooks when running MWTimestampTest"

diff --git a/tests/phpunit/includes/MWTimestampTest.php b/tests/phpunit/includes/MWTimestampTest.php
index dcb9856..05c1a66 100644 (file)
--- a/tests/phpunit/includes/MWTimestampTest.php
+++ b/tests/phpunit/includes/MWTimestampTest.php
@@ -8,6 +8,9 @@ class MWTimestampTest extends MediaWikiLangTestCase {
        protected function setUp() {
                parent::setUp();
 
+               // Avoid 'GetHumanTimestamp' hook and others
+               $this->setMwGlobals( 'wgHooks', array() );
+
                RequestContext::getMain()->setLanguage( Language::factory( 'en' ) );
        }