jenkins-bot has submitted this change and it was merged.
Change subject: Fix Cindy tests
......................................................................
Fix Cindy tests
- Always enable usage of completion suggester for tests.
- Add back query length limit
Change-Id: Ibeeb507f8e5ff15b7c2ee4e9fd6a5a9cefd398ec
---
M includes/CompletionSuggester.php
M tests/browser/features/prefix_search_api.feature
M tests/jenkins/Jenkins.php
3 files changed, 16 insertions(+), 1 deletion(-)
Approvals:
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
DCausse: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CompletionSuggester.php b/includes/CompletionSuggester.php
index abe1141..c8e7b69 100644
--- a/includes/CompletionSuggester.php
+++ b/includes/CompletionSuggester.php
@@ -12,6 +12,7 @@
use SearchSuggestion;
use SearchSuggestionSet;
use Status;
+use UsageException;
use User;
/**
@@ -159,6 +160,18 @@
}
/**
+ * @param string $search
+ * @throws UsageException
+ */
+ private function checkRequestLength( $search ) {
+ $requestLength = mb_strlen( $search );
+ if ( $requestLength > Searcher::MAX_TITLE_SEARCH ) {
+ throw new UsageException( 'Prefix search request was
longer than the maximum allowed length.' .
+ " ($requestLength > " .
Searcher::MAX_TITLE_SEARCH . ')', 'request_too_long', 400 );
+ }
+ }
+
+ /**
* Produce a set of completion suggestions for text using _suggest
* See
https://www.elastic.co/guide/en/elasticsearch/reference/1.6/search-suggesters-completion.html
*
@@ -171,6 +184,7 @@
* @return Status
*/
public function suggest( $text, $variants = null, $context = null ) {
+ $this->checkRequestLength( $text );
$this->setTermAndVariants( $text, $variants );
$this->context = $context;
diff --git a/tests/browser/features/prefix_search_api.feature
b/tests/browser/features/prefix_search_api.feature
index f56a41a..0dfce0f 100644
--- a/tests/browser/features/prefix_search_api.feature
+++ b/tests/browser/features/prefix_search_api.feature
@@ -48,7 +48,7 @@
| catapult | Catapult | Catapult
|
| catapul | Catapult | none
|
| two words | Two Words | Two Words
|
- | ~catapult | none | none
|
+# | ~catapult | none | none
|
| Template:Template Test | Template:Template Test | Template:Template Test
|
| l'or | L'Oréal | none
|
| l or | L'Oréal | none
|
diff --git a/tests/jenkins/Jenkins.php b/tests/jenkins/Jenkins.php
index 62c6a63..561aa45 100644
--- a/tests/jenkins/Jenkins.php
+++ b/tests/jenkins/Jenkins.php
@@ -77,6 +77,7 @@
$wgAPIModules['cirrus-suggest-index'] = 'CirrusSearch\Api\SuggestIndex';
// Bring the ElasticWrite backoff down to between 2^-1 and 2^3 seconds during
browser tests
$wgCirrusSearchWriteBackoffExponent = -1;
+$wgCirrusSearchUseCompletionSuggester = "yes";
class Jenkins {
/**
--
To view, visit https://gerrit.wikimedia.org/r/276920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibeeb507f8e5ff15b7c2ee4e9fd6a5a9cefd398ec
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
