Skip to content

Commit f9ce1dc

Browse files
Merge branch 'main' into node-joining-it-failure
2 parents 0934333 + 2e8dd2d commit f9ce1dc

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.elasticsearch.search.aggregations.AggregationBuilders;
5353
import org.elasticsearch.test.ESIntegTestCase;
5454
import org.elasticsearch.test.InternalSettingsPlugin;
55-
import org.elasticsearch.test.junit.annotations.TestIssueLogging;
5655
import org.elasticsearch.xcontent.XContentBuilder;
5756
import org.elasticsearch.xcontent.XContentFactory;
5857
import org.elasticsearch.xcontent.XContentType;
@@ -768,11 +767,7 @@ public void testFuzzyQueryString() {
768767
});
769768
}
770769

771-
@TestIssueLogging(
772-
value = "org.elasticsearch.search.query.SearchQueryIT:DEBUG",
773-
issueUrl = "https://github.com/elastic/elasticsearch/issues/43144"
774-
)
775-
public void testQuotedQueryStringWithBoost() throws InterruptedException {
770+
public void testQuotedQueryStringWithBoost() {
776771
float boost = 10.0f;
777772
assertAcked(prepareCreate("test").setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1)));
778773

server/src/test/java/org/elasticsearch/gateway/GatewayMetaStatePersistedStateTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.elasticsearch.index.IndexVersion;
4343
import org.elasticsearch.node.Node;
4444
import org.elasticsearch.test.ESTestCase;
45-
import org.elasticsearch.test.junit.annotations.TestIssueLogging;
4645
import org.elasticsearch.threadpool.TestThreadPool;
4746
import org.elasticsearch.threadpool.ThreadPool;
4847
import org.elasticsearch.transport.TransportService;
@@ -370,7 +369,6 @@ public void testStatePersistedOnLoad() throws IOException {
370369
}
371370
}
372371

373-
@TestIssueLogging(value = "org.elasticsearch.gateway:TRACE", issueUrl = "https://github.com/elastic/elasticsearch/issues/87952")
374372
public void testDataOnlyNodePersistence() throws Exception {
375373
final List<Closeable> cleanup = new ArrayList<>(2);
376374

server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
import org.elasticsearch.test.DummyShardLock;
131131
import org.elasticsearch.test.FieldMaskingReader;
132132
import org.elasticsearch.test.MockLog;
133-
import org.elasticsearch.test.junit.annotations.TestIssueLogging;
134133
import org.elasticsearch.test.junit.annotations.TestLogging;
135134
import org.elasticsearch.test.store.MockFSDirectoryFactory;
136135
import org.elasticsearch.threadpool.ThreadPool;
@@ -4084,10 +4083,6 @@ public void testIsSearchIdle() throws Exception {
40844083
closeShards(primary);
40854084
}
40864085

4087-
@TestIssueLogging(
4088-
issueUrl = "https://github.com/elastic/elasticsearch/issues/101008",
4089-
value = "org.elasticsearch.index.shard.IndexShard:TRACE"
4090-
)
40914086
public void testScheduledRefresh() throws Exception {
40924087
// Setup and make shard search idle:
40934088
Settings settings = indexSettings(IndexVersion.current(), 1, 1).build();

0 commit comments

Comments
 (0)