Skip to content

Commit 0a16e41

Browse files
authored
Remove stale test logging annotations (#43403)
This commit removes some very old test logging annotations that appeared to be added to investigate test failures that are long since closed. If these are needed, they can be added back on a case-by-case basis with a comment associating them to a test failure.
1 parent dc5a560 commit 0a16e41

File tree

54 files changed

+16
-178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+16
-178
lines changed

modules/reindex/src/test/java/org/elasticsearch/index/reindex/CancelTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.elasticsearch.ingest.IngestTestPlugin;
3838
import org.elasticsearch.plugins.Plugin;
3939
import org.elasticsearch.tasks.TaskInfo;
40-
import org.elasticsearch.test.junit.annotations.TestLogging;
4140
import org.hamcrest.Matcher;
4241
import org.junit.Before;
4342

@@ -60,7 +59,6 @@
6059
* different cancellation places - that is the responsibility of AsyncBulkByScrollActionTests which have more precise control to
6160
* simulate failures but does not exercise important portion of the stack like transport and task management.
6261
*/
63-
@TestLogging("org.elasticsearch.index.reindex:DEBUG,org.elasticsearch.action.bulk:DEBUG")
6462
public class CancelTests extends ReindexTestCase {
6563

6664
protected static final String INDEX = "reindex-cancel-index";

modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFailureTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.elasticsearch.action.bulk.BulkItemResponse.Failure;
2323
import org.elasticsearch.action.index.IndexRequestBuilder;
24-
import org.elasticsearch.test.junit.annotations.TestLogging;
2524

2625
import java.util.ArrayList;
2726
import java.util.List;
@@ -38,7 +37,6 @@
3837
/**
3938
* Tests failure capturing and abort-on-failure behavior of reindex.
4039
*/
41-
@TestLogging("_root:DEBUG")
4240
public class ReindexFailureTests extends ReindexTestCase {
4341
public void testFailuresCauseAbortDefault() throws Exception {
4442
/*

modules/reindex/src/test/java/org/elasticsearch/index/reindex/RethrottleTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.action.index.IndexRequestBuilder;
2828
import org.elasticsearch.index.query.QueryBuilders;
2929
import org.elasticsearch.tasks.TaskId;
30-
import org.elasticsearch.test.junit.annotations.TestLogging;
3130

3231
import java.util.ArrayList;
3332
import java.util.List;
@@ -50,7 +49,6 @@
5049
* too but this is the only place that tests running against multiple nodes so it is the only integration tests that checks for
5150
* serialization.
5251
*/
53-
@TestLogging("org.elasticsearch.index.reindex:TRACE,org.elasticsearch.action.bulk:TRACE,org.elasticsearch.search.SearchService:TRACE")
5452
public class RethrottleTests extends ReindexTestCase {
5553

5654
public void testReindex() throws Exception {

modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryBasicTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.elasticsearch.action.index.IndexRequestBuilder;
2323
import org.elasticsearch.search.sort.SortOrder;
24-
import org.elasticsearch.test.junit.annotations.TestLogging;
2524

2625
import java.util.ArrayList;
2726
import java.util.Collection;
@@ -34,7 +33,6 @@
3433
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
3534
import static org.hamcrest.Matchers.hasSize;
3635

37-
@TestLogging("org.elasticsearch.index.reindex:TRACE,org.elasticsearch.action.bulk:TRACE,org.elasticsearch.search.SearchService:TRACE")
3836
public class UpdateByQueryBasicTests extends ReindexTestCase {
3937
public void testBasics() throws Exception {
4038
indexRandom(true, client().prepareIndex("test", "test", "1").setSource("foo", "a"),

server/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
import org.elasticsearch.indices.IndicesService;
6363
import org.elasticsearch.test.ESIntegTestCase;
6464
import org.elasticsearch.test.VersionUtils;
65-
import org.elasticsearch.test.junit.annotations.TestLogging;
6665

6766
import java.util.Arrays;
6867
import java.util.Map;
@@ -81,7 +80,6 @@ protected boolean forbidPrivateIndexSettings() {
8180
return false;
8281
}
8382

84-
@TestLogging("org.elasticsearch.index.store:DEBUG")
8583
public void testCreateShrinkIndexToN() {
8684

8785
assumeFalse("https://github.com/elastic/elasticsearch/issues/34080", Constants.WINDOWS);

server/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.elasticsearch.indices.IndicesService;
3939
import org.elasticsearch.plugins.Plugin;
4040
import org.elasticsearch.test.ESIntegTestCase;
41-
import org.elasticsearch.test.junit.annotations.TestLogging;
4241
import org.elasticsearch.test.store.MockFSIndexStore;
4342

4443
import java.util.Arrays;
@@ -59,8 +58,6 @@
5958
import static org.hamcrest.Matchers.nullValue;
6059

6160
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST)
62-
@TestLogging("_root:DEBUG,org.elasticsearch.action.admin.indices.shards:TRACE,org.elasticsearch.cluster.service:TRACE," +
63-
"org.elasticsearch.gateway.TransportNodesListGatewayStartedShards:TRACE")
6461
public class IndicesShardStoreRequestIT extends ESIntegTestCase {
6562

6663
@Override

server/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.elasticsearch.test.InternalTestCluster;
4242
import org.elasticsearch.test.disruption.NetworkDisruption;
4343
import org.elasticsearch.test.disruption.NetworkDisruption.TwoPartitions;
44-
import org.elasticsearch.test.junit.annotations.TestLogging;
4544
import org.elasticsearch.test.transport.MockTransportService;
4645

4746
import java.util.ArrayList;
@@ -63,7 +62,6 @@
6362
import static org.hamcrest.Matchers.nullValue;
6463

6564
@ClusterScope(scope = Scope.TEST, numDataNodes = 0, autoManageMasterNodes = false)
66-
@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE,org.elasticsearch.cluster.coordination:TRACE")
6765
public class MinimumMasterNodesIT extends ESIntegTestCase {
6866

6967
@Override

server/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import org.elasticsearch.script.ScriptService;
5252
import org.elasticsearch.test.ESIntegTestCase;
5353
import org.elasticsearch.test.hamcrest.CollectionAssertions;
54-
import org.elasticsearch.test.junit.annotations.TestLogging;
5554
import org.elasticsearch.threadpool.ThreadPool;
5655
import org.elasticsearch.watcher.ResourceWatcherService;
5756
import org.junit.Before;
@@ -254,7 +253,6 @@ public void testLargeClusterStatePublishing() throws Exception {
254253
}
255254
}
256255

257-
@TestLogging("org.elasticsearch.action.admin.indices.close:DEBUG,org.elasticsearch.cluster.metadata:DEBUG")
258256
public void testIndicesOptions() throws Exception {
259257
ClusterStateResponse clusterStateResponse = client().admin().cluster().prepareState().clear().setMetaData(true).setIndices("f*")
260258
.get();

server/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
3232
import org.elasticsearch.test.ESIntegTestCase.Scope;
3333
import org.elasticsearch.test.InternalTestCluster;
34-
import org.elasticsearch.test.junit.annotations.TestLogging;
3534

3635
import java.io.IOException;
3736

@@ -40,7 +39,6 @@
4039
import static org.hamcrest.Matchers.nullValue;
4140

4241
@ClusterScope(scope = Scope.TEST, numDataNodes = 0, autoManageMasterNodes = false)
43-
@TestLogging("_root:DEBUG,org.elasticsearch.action.admin.cluster.state:TRACE")
4442
public class SpecificMasterNodesIT extends ESIntegTestCase {
4543

4644
public void testSimpleOnlyMasterNodeElection() throws IOException {

server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import org.elasticsearch.node.Node;
4141
import org.elasticsearch.test.ClusterServiceUtils;
4242
import org.elasticsearch.test.ESTestCase;
43-
import org.elasticsearch.test.junit.annotations.TestLogging;
4443
import org.elasticsearch.test.transport.CapturingTransport;
4544
import org.elasticsearch.threadpool.TestThreadPool;
4645
import org.elasticsearch.threadpool.ThreadPool;
@@ -76,7 +75,6 @@
7675
import static org.hamcrest.Matchers.containsString;
7776
import static org.hamcrest.Matchers.equalTo;
7877

79-
@TestLogging("org.elasticsearch.cluster.service:TRACE,org.elasticsearch.cluster.coordination:TRACE")
8078
public class NodeJoinTests extends ESTestCase {
8179

8280
private static ThreadPool threadPool;

0 commit comments

Comments
 (0)