Merge "Avoid "unittest_imagelinks" already exists error in tests"

[lhc/web/wiklou.git] / tests / common / TestSetup.php

diff --git a/tests/common/TestSetup.php b/tests/common/TestSetup.php
index 6c3ad07..c176a67 100644 (file)
--- a/tests/common/TestSetup.php
+++ b/tests/common/TestSetup.php
@@ -1,7 +1,5 @@
 <?php
 
-use MediaWiki\MediaWikiServices;
-
 /**
  * Common code for test environment initialisation and teardown
  */
@@ -15,6 +13,7 @@ class TestSetup {
                global $wgMainStash;
                global $wgLanguageConverterCacheType, $wgUseDatabaseMessages;
                global $wgLocaltimezone, $wgLocalisationCacheConf;
+               global $wgSearchType;
                global $wgDevelopmentWarnings;
                global $wgSessionProviders, $wgSessionPbkdf2Iterations;
                global $wgJobTypeConf;
@@ -40,7 +39,7 @@ class TestSetup {
                $wgMainStash = 'hash';
                // Use memory job queue
                $wgJobTypeConf = [
-                       'default' => [ 'class' => 'JobQueueMemory', 'order' => 'fifo' ],
+                       'default' => [ 'class' => JobQueueMemory::class, 'order' => 'fifo' ],
                ];
 
                $wgUseDatabaseMessages = false; # Set for future resets
@@ -48,7 +47,10 @@ class TestSetup {
                // Assume UTC for testing purposes
                $wgLocaltimezone = 'UTC';
 
-               $wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
+               $wgLocalisationCacheConf['storeClass'] = LCStoreNull::class;
+
+               // Do not bother updating search tables
+               $wgSearchType = SearchEngineDummy::class;
 
                // Generic MediaWiki\Session\SessionManager configuration for tests
                // We use CookieSessionProvider because things might be expecting
@@ -87,7 +89,7 @@ class TestSetup {
                ];
                $wgAuth = new MediaWiki\Auth\AuthManagerAuthPlugin();
 
-               // Bug 44192 Do not attempt to send a real e-mail
+               // T46192 Do not attempt to send a real e-mail
                Hooks::clear( 'AlternateUserMailer' );
                Hooks::register(
                        'AlternateUserMailer',