Skip to content

Commit ba77a50

Browse files
authored
Annotate geo ip tests with @WithoutEntitlements that use terminal (elastic#137707)
Fixes several failing tests.
1 parent cc2150a commit ba77a50

File tree

6 files changed

+12
-0
lines changed

6 files changed

+12
-0
lines changed

modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
1717
import org.elasticsearch.action.index.IndexRequest;
1818
import org.elasticsearch.common.hash.MessageDigests;
19+
import org.elasticsearch.test.ESTestCase;
1920
import org.elasticsearch.xcontent.XContentType;
2021

2122
import java.io.BufferedInputStream;
@@ -39,6 +40,7 @@
3940

4041
import static org.hamcrest.Matchers.equalTo;
4142

43+
@ESTestCase.WithoutEntitlements // some tests with geo use command line
4244
public class DatabaseNodeServiceIT extends AbstractGeoIpIT {
4345
/*
4446
* This test makes sure that if we index an ordinary mmdb file into the .geoip_databases index, it is correctly handled upon retrieval.

modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderCliIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
package org.elasticsearch.ingest.geoip;
1111

1212
import org.elasticsearch.common.settings.Settings;
13+
import org.elasticsearch.test.ESTestCase;
1314

15+
@ESTestCase.WithoutEntitlements // some tests with geo use command line
1416
public class GeoIpDownloaderCliIT extends GeoIpDownloaderIT {
1517

1618
@Override

modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.elasticsearch.reindex.ReindexPlugin;
4040
import org.elasticsearch.search.SearchHit;
4141
import org.elasticsearch.search.sort.SortOrder;
42+
import org.elasticsearch.test.ESTestCase;
4243
import org.elasticsearch.test.junit.annotations.TestLogging;
4344
import org.elasticsearch.xcontent.XContentBuilder;
4445
import org.elasticsearch.xcontent.XContentType;
@@ -85,6 +86,7 @@
8586
import static org.hamcrest.Matchers.notNullValue;
8687
import static org.hamcrest.Matchers.nullValue;
8788

89+
@ESTestCase.WithoutEntitlements // some tests with geo use command line
8890
public class GeoIpDownloaderIT extends AbstractGeoIpIT {
8991

9092
@Override

modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderStatsIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.elasticsearch.plugins.Plugin;
1717
import org.elasticsearch.reindex.ReindexPlugin;
1818
import org.elasticsearch.test.ESIntegTestCase;
19+
import org.elasticsearch.test.ESTestCase;
1920
import org.elasticsearch.test.XContentTestUtils;
2021
import org.elasticsearch.xcontent.ToXContent;
2122
import org.elasticsearch.xcontent.XContentBuilder;
@@ -38,6 +39,7 @@
3839
import static org.hamcrest.Matchers.hasKey;
3940
import static org.hamcrest.Matchers.hasSize;
4041

42+
@ESTestCase.WithoutEntitlements // some tests with geo use command line
4143
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, maxNumDataNodes = 1)
4244
public class GeoIpDownloaderStatsIT extends AbstractGeoIpIT {
4345

modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderTaskIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
1717
import org.elasticsearch.plugins.Plugin;
1818
import org.elasticsearch.reindex.ReindexPlugin;
19+
import org.elasticsearch.test.ESTestCase;
1920
import org.junit.After;
2021

2122
import java.util.Collection;
2223
import java.util.List;
2324

25+
@ESTestCase.WithoutEntitlements // some tests with geo use command line
2426
public class GeoIpDownloaderTaskIT extends AbstractGeoIpIT {
2527

2628
@Override

modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.elasticsearch.common.settings.Settings;
1818
import org.elasticsearch.ingest.IngestService;
1919
import org.elasticsearch.rest.RestStatus;
20+
import org.elasticsearch.test.ESTestCase;
2021
import org.elasticsearch.test.NodeRoles;
2122
import org.elasticsearch.xcontent.XContentBuilder;
2223
import org.elasticsearch.xcontent.XContentType;
@@ -30,6 +31,7 @@
3031
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
3132
import static org.hamcrest.Matchers.equalTo;
3233

34+
@ESTestCase.WithoutEntitlements // some tests with geo use command line
3335
public class GeoIpProcessorNonIngestNodeIT extends AbstractGeoIpIT {
3436

3537
@Override

0 commit comments

Comments
 (0)