Skip to content

Commit 2677424

Browse files
authored
Disable entitlements for terminal & command tests (#130690) (#130798)
1 parent 4a91f85 commit 2677424

File tree

5 files changed

+10
-0
lines changed

5 files changed

+10
-0
lines changed

server/src/test/java/org/elasticsearch/cli/TerminalTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
package org.elasticsearch.cli;
1111

1212
import org.elasticsearch.test.ESTestCase;
13+
import org.elasticsearch.test.ESTestCase.WithoutEntitlements;
1314

1415
import java.io.StringReader;
1516

1617
import static org.elasticsearch.cli.Terminal.readLineToCharArray;
1718
import static org.hamcrest.Matchers.equalTo;
1819

20+
@WithoutEntitlements // test & cli only - never running with entitlements enabled
1921
public class TerminalTests extends ESTestCase {
2022

2123
public void testVerbosity() throws Exception {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.elasticsearch.index.Index;
2929
import org.elasticsearch.indices.IndicesModule;
3030
import org.elasticsearch.test.ESTestCase;
31+
import org.elasticsearch.test.ESTestCase.WithoutEntitlements;
3132
import org.elasticsearch.test.TestClusterCustomMetadata;
3233
import org.elasticsearch.test.TestProjectCustomMetadata;
3334
import org.elasticsearch.xcontent.NamedXContentRegistry;
@@ -46,6 +47,7 @@
4647
import static org.hamcrest.Matchers.instanceOf;
4748
import static org.hamcrest.Matchers.not;
4849

50+
@WithoutEntitlements // commands don't run with entitlements enforced
4951
public class ElasticsearchNodeCommandTests extends ESTestCase {
5052

5153
public void testLoadStateWithoutMissingCustomsButPreserved() throws IOException {

server/src/test/java/org/elasticsearch/env/NodeRepurposeCommandTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.elasticsearch.index.Index;
2828
import org.elasticsearch.index.IndexVersion;
2929
import org.elasticsearch.test.ESTestCase;
30+
import org.elasticsearch.test.ESTestCase.WithoutEntitlements;
3031
import org.hamcrest.Matcher;
3132
import org.junit.Before;
3233

@@ -48,6 +49,7 @@
4849
import static org.hamcrest.Matchers.containsString;
4950
import static org.hamcrest.Matchers.not;
5051

52+
@WithoutEntitlements // commands don't run with entitlements enforced
5153
public class NodeRepurposeCommandTests extends ESTestCase {
5254

5355
private static final Index INDEX = new Index("testIndex", "testUUID");

server/src/test/java/org/elasticsearch/env/OverrideNodeVersionCommandTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.elasticsearch.common.settings.Settings;
2222
import org.elasticsearch.gateway.PersistedClusterStateService;
2323
import org.elasticsearch.test.ESTestCase;
24+
import org.elasticsearch.test.ESTestCase.WithoutEntitlements;
2425
import org.junit.After;
2526
import org.junit.Before;
2627

@@ -31,6 +32,7 @@
3132
import static org.hamcrest.Matchers.containsString;
3233
import static org.hamcrest.Matchers.equalTo;
3334

35+
@WithoutEntitlements // commands don't run with entitlements enforced
3436
public class OverrideNodeVersionCommandTests extends ESTestCase {
3537

3638
private Environment environment;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import org.elasticsearch.test.CorruptionUtils;
5555
import org.elasticsearch.test.DummyShardLock;
5656
import org.elasticsearch.test.ESTestCase;
57+
import org.elasticsearch.test.ESTestCase.WithoutEntitlements;
5758
import org.junit.Before;
5859

5960
import java.io.IOException;
@@ -77,6 +78,7 @@
7778
import static org.hamcrest.Matchers.is;
7879
import static org.hamcrest.Matchers.startsWith;
7980

81+
@WithoutEntitlements // commands don't run with entitlements enforced
8082
public class RemoveCorruptedShardDataCommandTests extends IndexShardTestCase {
8183

8284
private ShardId shardId;

0 commit comments

Comments
 (0)