honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add warning handler to resolve test failure (#60427) (#61102)

This commit is contained in:
Dan Hermann 2020-08-13 10:37:08 -05:00 committed by GitHub
parent 3143b5ea47
commit c17839c255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/IndexingIT.java
View File

@ -6,7 +6,6 @@
package org.elasticsearch.upgrades; package org.elasticsearch.upgrades;
import org.apache.http.util.EntityUtils; import org.apache.http.util.EntityUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.client.Request; import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response; import org.elasticsearch.client.Response;
@ -29,7 +28,6 @@ import static org.hamcrest.Matchers.equalTo;
* oss rolling restart tests. We should work on a way to remove this * oss rolling restart tests. We should work on a way to remove this
* duplication but for now we have no real way to share code. * duplication but for now we have no real way to share code.
*/ */
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/58807")
public class IndexingIT extends AbstractUpgradeTestCase { public class IndexingIT extends AbstractUpgradeTestCase {
public void testIndexing() throws IOException { public void testIndexing() throws IOException {
switch (CLUSTER_TYPE) { switch (CLUSTER_TYPE) {
@ -76,6 +74,7 @@ public class IndexingIT extends AbstractUpgradeTestCase {
} }
Request createTestIndex = new Request("PUT", "/test_index"); Request createTestIndex = new Request("PUT", "/test_index");
createTestIndex.setJsonEntity("{\"settings\": {\"index.number_of_replicas\": 0}}"); createTestIndex.setJsonEntity("{\"settings\": {\"index.number_of_replicas\": 0}}");
useIgnoreMultipleMatchingTemplatesWarningsHandler(createTestIndex);
client().performRequest(createTestIndex); client().performRequest(createTestIndex);
allowedWarnings("index [test_index] matches multiple legacy templates [global, xpack-prevent-bwc-deprecation-template], " + allowedWarnings("index [test_index] matches multiple legacy templates [global, xpack-prevent-bwc-deprecation-template], " +
"composable templates will only match a single template"); "composable templates will only match a single template");
@ -83,11 +82,13 @@ public class IndexingIT extends AbstractUpgradeTestCase {
String recoverQuickly = "{\"settings\": {\"index.unassigned.node_left.delayed_timeout\": \"100ms\"}}"; String recoverQuickly = "{\"settings\": {\"index.unassigned.node_left.delayed_timeout\": \"100ms\"}}";
Request createIndexWithReplicas = new Request("PUT", "/index_with_replicas"); Request createIndexWithReplicas = new Request("PUT", "/index_with_replicas");
createIndexWithReplicas.setJsonEntity(recoverQuickly); createIndexWithReplicas.setJsonEntity(recoverQuickly);
useIgnoreMultipleMatchingTemplatesWarningsHandler(createIndexWithReplicas);
client().performRequest(createIndexWithReplicas); client().performRequest(createIndexWithReplicas);
Request createEmptyIndex = new Request("PUT", "/empty_index"); Request createEmptyIndex = new Request("PUT", "/empty_index");
// Ask for recovery to be quick // Ask for recovery to be quick
createEmptyIndex.setJsonEntity(recoverQuickly); createEmptyIndex.setJsonEntity(recoverQuickly);
useIgnoreMultipleMatchingTemplatesWarningsHandler(createEmptyIndex);
client().performRequest(createEmptyIndex); client().performRequest(createEmptyIndex);
bulk("test_index", "_OLD", 5); bulk("test_index", "_OLD", 5);

3
x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/TokenBackwardsCompatibilityIT.java
View File

@ -7,7 +7,6 @@ package org.elasticsearch.upgrades;
import org.apache.http.HttpHeaders; import org.apache.http.HttpHeaders;
import org.apache.http.HttpHost; import org.apache.http.HttpHost;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.client.Request; import org.elasticsearch.client.Request;
import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RequestOptions;
@ -31,7 +30,6 @@ import java.util.Map;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/58807")
public class TokenBackwardsCompatibilityIT extends AbstractUpgradeTestCase { public class TokenBackwardsCompatibilityIT extends AbstractUpgradeTestCase {
private Collection<RestClient> twoClients = null; private Collection<RestClient> twoClients = null;
@ -407,6 +405,7 @@ public class TokenBackwardsCompatibilityIT extends AbstractUpgradeTestCase {
" \"token\": \"" + accessToken + "\",\n" + " \"token\": \"" + accessToken + "\",\n" +
" \"refresh_token\": \"" + refreshToken + "\"\n" + " \"refresh_token\": \"" + refreshToken + "\"\n" +
"}"); "}");
useIgnoreMultipleMatchingTemplatesWarningsHandler(indexRequest);
Response indexResponse1 = client.performRequest(indexRequest); Response indexResponse1 = client.performRequest(indexRequest);
assertOK(indexResponse1); assertOK(indexResponse1);
} }