jenkins-bot has submitted this change and it was merged.

Change subject: Fix unit tests running on non-DB environment
......................................................................


Fix unit tests running on non-DB environment

Bug: T138551
Change-Id: Ie1d3c8b24e5271d4e12f4190400531cbe606bfd4
---
M tests/phpunit/includes/search/SearchEngineTest.php
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/includes/search/SearchEngineTest.php 
b/tests/phpunit/includes/search/SearchEngineTest.php
index 055e982..40a33d9 100644
--- a/tests/phpunit/includes/search/SearchEngineTest.php
+++ b/tests/phpunit/includes/search/SearchEngineTest.php
@@ -50,6 +50,10 @@
                        return;
                }
 
+               // Reset the search type back to default - some extensions may 
have
+               // overridden it.
+               $this->setMwGlobals( [ 'wgSearchType' => null ] );
+
                $this->insertPage( 'Not_Main_Page', 'This is not a main page' );
                $this->insertPage(
                        'Talk:Not_Main_Page',

-- 
To view, visit https://gerrit.wikimedia.org/r/295769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1d3c8b24e5271d4e12f4190400531cbe606bfd4
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to