Skip to content

Commit 7543478

Browse files
martijnvgmartijnvg
authored
Remove xpack dependencies from qa rest modules (#41134)
This commit removes xpack dependencies of many xpack qa modules. (for some qa modules this will require some more work) The reason behind this change is that qa rest modules should not depend on the x-pack plugins, because the plugins are an implementation detail and the tests should only know about the rest interface and qa cluster that is being tested. Also some qa modules rely on xpack plugins and hlrc (which is a valid dependency for rest qa tests) creates a cyclic dependency and this is something that we should avoid. Also Eclipse can't handle gradle cyclic dependencies (see #41064). * don't copy xpack-core's plugin property into the test resource of qa modules. Otherwise installing security manager fails, because it tries to find the XPackPlugin class.
1 parent f0fac9f commit 7543478

File tree

34 files changed

+173
-147
lines changed

34 files changed

+173
-147
lines changed

‎x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/WatcherTemplateTests.java renamed to ‎x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/support/WatcherTemplateTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* or more contributor license agreements. Licensed under the Elastic License;
44
* you may not use this file except in compliance with the Elastic License.
55
*/
6-
package org.elasticsearch.smoketest;
6+
package org.elasticsearch.xpack.watcher.support;
77

88
import com.fasterxml.jackson.core.io.JsonStringEncoder;
99
import org.elasticsearch.common.Nullable;

‎x-pack/qa/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33

44
import org.elasticsearch.gradle.test.RestIntegTestTask
55

6+
apply plugin: 'elasticsearch.build'
7+
test.enabled = false
8+
9+
dependencies {
10+
compile project(':test:framework')
11+
}
12+
613
subprojects {
714
// HACK: please fix this
815
// we want to add the rest api specs for xpack to qa tests, but we

‎x-pack/qa/core-rest-tests-with-security/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
22
apply plugin: 'elasticsearch.rest-test'
33

44
dependencies {
5-
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
6-
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
5+
testCompile project(':x-pack:qa')
76
}
87

98
integTest {

‎x-pack/qa/core-rest-tests-with-security/src/test/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.util.Objects;
2020

21-
import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
21+
import static org.elasticsearch.xpack.test.SecuritySettingsSourceField.basicAuthHeaderValue;
2222

2323
@TimeoutSuite(millis = 30 * TimeUnits.MINUTE) // as default timeout seems not enough on the jenkins VMs
2424
public class CoreWithSecurityClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {

‎x-pack/qa/full-cluster-restart/build.gradle

+5-22
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,12 @@ apply plugin: 'elasticsearch.standalone-test'
1010
test.enabled = false
1111

1212
dependencies {
13-
// "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here
14-
testCompile project(path: xpackModule('core'), configuration: 'default')
15-
testCompile (project(path: xpackModule('security'), configuration: 'runtime')) {
16-
// Need to drop the guava dependency here or we get a conflict with watcher's guava dependency.
17-
// This is total #$%, but the solution is to get the SAML realm (which uses guava) out of security proper
18-
exclude group: "com.google.guava", module: "guava"
19-
}
20-
testCompile project(path: xpackModule('watcher'), configuration: 'runtime')
21-
13+
// TODO: Remove core dependency and change tests to not use builders that are part of xpack-core.
14+
// Currently needed for ml tests are using the building for datafeed and job config)
2215
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
23-
testCompile (project(path: xpackModule('security'), configuration: 'testArtifacts')) {
24-
// Need to drop the guava dependency here or we get a conflict with watcher's guava dependency.
25-
// This is total #$%, but the solution is to get the SAML realm (which uses guava) out of security proper
26-
exclude group: "com.google.guava", module: "guava"
27-
}
16+
2817
testCompile project(path: ':qa:full-cluster-restart', configuration: 'testArtifacts')
18+
testCompile project(':x-pack:qa')
2919
}
3020

3121
Closure waitWithAuth = { NodeInfo node, AntBuilder ant ->
@@ -225,11 +215,4 @@ task copyXPackRestSpec(type: Copy) {
225215
include 'rest-api-spec/api/**'
226216
into project.sourceSets.test.output.resourcesDir
227217
}
228-
229-
task copyXPackPluginProps(type: Copy) {
230-
dependsOn(copyXPackRestSpec)
231-
from project(xpackModule('core')).file('src/main/plugin-metadata')
232-
from project(xpackModule('core')).tasks.pluginProperties
233-
into outputDir
234-
}
235-
project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
218+
project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackRestSpec)

‎x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java

+15-20
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,12 @@
1313
import org.elasticsearch.common.settings.Settings;
1414
import org.elasticsearch.common.util.concurrent.ThreadContext;
1515
import org.elasticsearch.common.xcontent.ObjectPath;
16-
import org.elasticsearch.common.xcontent.XContentType;
1716
import org.elasticsearch.common.xcontent.support.XContentMapValues;
1817
import org.elasticsearch.rest.RestStatus;
1918
import org.elasticsearch.rest.action.search.RestSearchAction;
2019
import org.elasticsearch.test.StreamsUtils;
2120
import org.elasticsearch.test.rest.ESRestTestCase;
2221
import org.elasticsearch.upgrades.AbstractFullClusterRestartTestCase;
23-
import org.elasticsearch.xpack.core.upgrade.UpgradeField;
24-
import org.elasticsearch.xpack.core.watcher.client.WatchSourceBuilder;
25-
import org.elasticsearch.xpack.security.support.SecurityIndexManager;
26-
import org.elasticsearch.xpack.watcher.actions.index.IndexAction;
27-
import org.elasticsearch.xpack.watcher.actions.logging.LoggingAction;
28-
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
29-
import org.elasticsearch.xpack.watcher.condition.InternalAlwaysCondition;
30-
import org.elasticsearch.xpack.watcher.trigger.schedule.IntervalSchedule;
31-
import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTrigger;
3222
import org.hamcrest.Matcher;
3323

3424
import java.io.IOException;
@@ -54,6 +44,12 @@
5444

5545
public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
5646

47+
public static final String INDEX_ACTION_TYPES_DEPRECATION_MESSAGE =
48+
"[types removal] Specifying types in a watcher index action is deprecated.";
49+
50+
public static final int UPGRADE_FIELD_EXPECTED_INDEX_FORMAT_VERSION = 6;
51+
public static final int SECURITY_EXPECTED_INDEX_FORMAT_VERSION = 6;
52+
5753
@Override
5854
protected Settings restClientSettings() {
5955
String token = "Basic " + Base64.getEncoder().encodeToString("test_user:x-pack-test-password".getBytes(StandardCharsets.UTF_8));
@@ -106,7 +102,7 @@ public void testSecurityNativeRealm() throws Exception {
106102
if (settingsMap.containsKey("index")) {
107103
@SuppressWarnings("unchecked")
108104
int format = Integer.parseInt(String.valueOf(((Map<String, Object>)settingsMap.get("index")).get("format")));
109-
assertEquals("The security index needs to be upgraded", SecurityIndexManager.INTERNAL_INDEX_FORMAT, format);
105+
assertEquals("The security index needs to be upgraded", SECURITY_EXPECTED_INDEX_FORMAT_VERSION, format);
110106
}
111107
}
112108

@@ -127,8 +123,8 @@ public void testWatcher() throws Exception {
127123
Request createBwcWatch = new Request("PUT", getWatcherEndpoint() + "/watch/bwc_watch");
128124
Request createBwcThrottlePeriod = new Request("PUT", getWatcherEndpoint() + "/watch/bwc_throttle_period");
129125
if (getOldClusterVersion().onOrAfter(Version.V_7_0_0)) {
130-
createBwcWatch.setOptions(expectWarnings(IndexAction.TYPES_DEPRECATION_MESSAGE));
131-
createBwcThrottlePeriod.setOptions(expectWarnings(IndexAction.TYPES_DEPRECATION_MESSAGE));
126+
createBwcWatch.setOptions(expectWarnings(INDEX_ACTION_TYPES_DEPRECATION_MESSAGE));
127+
createBwcThrottlePeriod.setOptions(expectWarnings(INDEX_ACTION_TYPES_DEPRECATION_MESSAGE));
132128
}
133129
createBwcWatch.setJsonEntity(loadWatch("simple-watch.json"));
134130
client().performRequest(createBwcWatch);
@@ -166,7 +162,7 @@ public void testWatcher() throws Exception {
166162
logger.info("settings map {}", settingsMap);
167163
if (settingsMap.containsKey("index")) {
168164
int format = Integer.parseInt(String.valueOf(((Map<String, Object>)settingsMap.get("index")).get("format")));
169-
assertEquals("The watches index needs to be upgraded", UpgradeField.EXPECTED_INDEX_FORMAT_VERSION, format);
165+
assertEquals("The watches index needs to be upgraded", UPGRADE_FIELD_EXPECTED_INDEX_FORMAT_VERSION, format);
170166
}
171167
}
172168

@@ -289,7 +285,7 @@ private void assertWatchIndexContentsWork() throws Exception {
289285
Request getRequest = new Request("GET", "_watcher/watch/bwc_watch");
290286
getRequest.setOptions(
291287
expectWarnings(
292-
IndexAction.TYPES_DEPRECATION_MESSAGE
288+
INDEX_ACTION_TYPES_DEPRECATION_MESSAGE
293289
)
294290
);
295291

@@ -310,7 +306,7 @@ private void assertWatchIndexContentsWork() throws Exception {
310306
getRequest = new Request("GET", "_watcher/watch/bwc_throttle_period");
311307
getRequest.setOptions(
312308
expectWarnings(
313-
IndexAction.TYPES_DEPRECATION_MESSAGE
309+
INDEX_ACTION_TYPES_DEPRECATION_MESSAGE
314310
)
315311
);
316312

@@ -352,10 +348,9 @@ private void assertWatchIndexContentsWork() throws Exception {
352348

353349
private void assertBasicWatchInteractions() throws Exception {
354350

355-
String watch = new WatchSourceBuilder()
356-
.condition(InternalAlwaysCondition.INSTANCE)
357-
.trigger(ScheduleTrigger.builder(new IntervalSchedule(IntervalSchedule.Interval.seconds(1))))
358-
.addAction("awesome", LoggingAction.builder(new TextTemplate("test"))).buildAsBytes(XContentType.JSON).utf8ToString();
351+
String watch = "{\"trigger\":{\"schedule\":{\"interval\":\"1s\"}},\"input\":{\"none\":{}}," +
352+
"\"condition\":{\"always\":{}}," +
353+
"\"actions\":{\"awesome\":{\"logging\":{\"level\":\"info\",\"text\":\"test\"}}}}";
359354
Request createWatchRequest = new Request("PUT", "_watcher/watch/new_watch");
360355
createWatchRequest.setJsonEntity(watch);
361356
Map<String, Object> createWatch = entityAsMap(client().performRequest(createWatchRequest));

‎x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/MlMigrationFullClusterRestartIT.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.elasticsearch.xpack.core.ml.job.config.DataDescription;
2525
import org.elasticsearch.xpack.core.ml.job.config.Detector;
2626
import org.elasticsearch.xpack.core.ml.job.config.Job;
27+
import org.elasticsearch.xpack.test.rest.XPackRestTestConstants;
2728
import org.elasticsearch.xpack.test.rest.XPackRestTestHelper;
2829
import org.junit.Before;
2930

@@ -56,7 +57,7 @@ protected Settings restClientSettings() {
5657

5758
@Before
5859
public void waitForMlTemplates() throws Exception {
59-
List<String> templatesToWaitFor = XPackRestTestHelper.ML_POST_V660_TEMPLATES;
60+
List<String> templatesToWaitFor = XPackRestTestConstants.ML_POST_V660_TEMPLATES;
6061
XPackRestTestHelper.waitForTemplates(client(), templatesToWaitFor);
6162
}
6263

‎x-pack/qa/multi-cluster-search-security/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
33
apply plugin: 'elasticsearch.standalone-test'
44

55
dependencies {
6-
// "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here
7-
testCompile project(path: xpackModule('core'), configuration: 'default')
8-
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
6+
testCompile project(':x-pack:qa')
97
}
108

119
task remoteClusterTest(type: RestIntegTestTask) {

‎x-pack/qa/multi-cluster-search-security/src/test/java/org/elasticsearch/xpack/security/MultiClusterSearchWithSecurityYamlTestSuiteIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
1515
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
1616

17-
import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
17+
import static org.elasticsearch.xpack.test.SecuritySettingsSourceField.basicAuthHeaderValue;
1818

1919
public class MultiClusterSearchWithSecurityYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
2020

‎x-pack/qa/multi-node/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.standalone-rest-test'
22
apply plugin: 'elasticsearch.rest-test'
33

44
dependencies {
5-
testCompile "org.elasticsearch.plugin:x-pack-core:${version}"
5+
testCompile project(':x-pack:qa')
66
}
77

88
integTestCluster {

‎x-pack/qa/multi-node/src/test/java/org/elasticsearch/multi_node/GlobalCheckpointSyncActionIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.elasticsearch.test.rest.yaml.ObjectPath;
1717

1818
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
19-
import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
19+
import static org.elasticsearch.xpack.test.SecuritySettingsSourceField.basicAuthHeaderValue;
2020
import static org.hamcrest.Matchers.equalTo;
2121

2222
public class GlobalCheckpointSyncActionIT extends ESRestTestCase {

‎x-pack/qa/multi-node/src/test/java/org/elasticsearch/multi_node/RollupIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.util.concurrent.TimeUnit;
3333

3434
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
35-
import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
35+
import static org.elasticsearch.xpack.test.SecuritySettingsSourceField.basicAuthHeaderValue;
3636
import static org.hamcrest.Matchers.equalTo;
3737
import static org.hamcrest.Matchers.isOneOf;
3838

‎x-pack/qa/rolling-upgrade-basic/build.gradle

+2-11
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
44
apply plugin: 'elasticsearch.standalone-test'
55

66
dependencies {
7-
// "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here
8-
testCompile project(path: xpackModule('core'), configuration: 'default')
9-
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') // to be moved in a later commit
7+
testCompile project(':x-pack:qa')
108
}
119

1210
// This is a top level task which we will add dependencies to below.
@@ -141,14 +139,7 @@ task copyXPackRestSpec(type: Copy) {
141139
include 'rest-api-spec/api/**'
142140
into project.sourceSets.test.output.resourcesDir
143141
}
144-
145-
task copyXPackPluginProps(type: Copy) {
146-
dependsOn(copyXPackRestSpec)
147-
from project(xpackModule('core')).file('src/main/plugin-metadata')
148-
from project(xpackModule('core')).tasks.pluginProperties
149-
into outputDir
150-
}
151-
project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
142+
project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackRestSpec)
152143

153144
repositories {
154145
maven {

‎x-pack/qa/rolling-upgrade-multi-cluster/build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import org.elasticsearch.gradle.test.RestIntegTestTask
44
apply plugin: 'elasticsearch.standalone-test'
55

66
dependencies {
7-
// "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here
8-
testCompile project(path: xpackModule('core'), configuration: 'default')
9-
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') // to be moved in a later commit
7+
testCompile project(':x-pack:qa')
108
}
119

1210
// This is a top level task which we will add dependencies to below.

‎x-pack/qa/rolling-upgrade/build.gradle

+2-12
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ apply plugin: 'elasticsearch.standalone-test'
1010
test.enabled = false
1111

1212
dependencies {
13-
// "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here
14-
testCompile project(path: xpackModule('core'), configuration: 'default')
15-
testCompile project(path: xpackModule('security'), configuration: 'runtime')
16-
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') // to be moved in a later commit
13+
testCompile project(':x-pack:qa')
1714
testCompile ("org.elasticsearch.client:elasticsearch-rest-high-level-client:${version}")
1815
}
1916

@@ -307,11 +304,4 @@ task copyXPackRestSpec(type: Copy) {
307304
include 'rest-api-spec/api/**'
308305
into project.sourceSets.test.output.resourcesDir
309306
}
310-
311-
task copyXPackPluginProps(type: Copy) {
312-
dependsOn(copyXPackRestSpec)
313-
from project(xpackModule('core')).file('src/main/plugin-metadata')
314-
from project(xpackModule('core')).tasks.pluginProperties
315-
into outputDir
316-
}
317-
project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackPluginProps)
307+
project.sourceSets.test.output.dir(outputDir, builtBy: copyXPackRestSpec)

‎x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/AbstractUpgradeTestCase.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
import org.elasticsearch.client.Request;
99
import org.elasticsearch.common.settings.Settings;
1010
import org.elasticsearch.common.util.concurrent.ThreadContext;
11-
import org.elasticsearch.test.SecuritySettingsSourceField;
11+
import org.elasticsearch.xpack.test.SecuritySettingsSourceField;
1212
import org.elasticsearch.test.rest.ESRestTestCase;
1313
import org.junit.Before;
1414

1515
import java.io.IOException;
1616
import java.util.Collection;
1717
import java.util.Collections;
1818

19-
import static org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken.basicAuthHeaderValue;
19+
import static org.elasticsearch.xpack.test.SecuritySettingsSourceField.basicAuthHeaderValue;
2020

2121
public abstract class AbstractUpgradeTestCase extends ESRestTestCase {
2222

2323
private static final String BASIC_AUTH_VALUE =
24-
basicAuthHeaderValue("test_user", SecuritySettingsSourceField.TEST_PASSWORD_SECURE_STRING);
24+
basicAuthHeaderValue("test_user", SecuritySettingsSourceField.TEST_PASSWORD);
2525

2626
@Override
2727
protected boolean preserveIndicesUponCompletion() {

‎x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/MlMappingsUpgradeIT.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.elasticsearch.client.ml.job.config.Job;
1515
import org.elasticsearch.common.Strings;
1616
import org.elasticsearch.common.unit.TimeValue;
17-
import org.elasticsearch.xpack.core.ml.job.persistence.AnomalyDetectorsIndex;
17+
import org.elasticsearch.xpack.test.rest.XPackRestTestConstants;
1818
import org.elasticsearch.xpack.test.rest.XPackRestTestHelper;
1919

2020
import java.io.IOException;
@@ -30,7 +30,7 @@ public class MlMappingsUpgradeIT extends AbstractUpgradeTestCase {
3030

3131
@Override
3232
protected Collection<String> templatesToWaitFor() {
33-
return Stream.concat(XPackRestTestHelper.ML_POST_V660_TEMPLATES.stream(),
33+
return Stream.concat(XPackRestTestConstants.ML_POST_V660_TEMPLATES.stream(),
3434
super.templatesToWaitFor().stream()).collect(Collectors.toSet());
3535
}
3636

@@ -81,7 +81,7 @@ private void createAndOpenTestJob() throws IOException {
8181
private void assertUpgradedMappings() throws Exception {
8282

8383
assertBusy(() -> {
84-
Request getMappings = new Request("GET", AnomalyDetectorsIndex.resultsWriteAlias(JOB_ID) + "/_mappings");
84+
Request getMappings = new Request("GET", XPackRestTestHelper.resultsWriteAlias(JOB_ID) + "/_mappings");
8585
Response response = client().performRequest(getMappings);
8686

8787
Map<String, Object> responseLevel = entityAsMap(response);

‎x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.elasticsearch.test.rest.ESRestTestCase;
1414
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
1515
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
16+
import org.elasticsearch.xpack.test.rest.XPackRestTestConstants;
1617
import org.elasticsearch.xpack.test.rest.XPackRestTestHelper;
1718
import org.junit.Before;
1819

@@ -28,7 +29,7 @@ public class UpgradeClusterClientYamlTestSuiteIT extends ESClientYamlSuiteTestCa
2829
*/
2930
@Before
3031
public void waitForTemplates() throws Exception {
31-
XPackRestTestHelper.waitForTemplates(client(), XPackRestTestHelper.ML_POST_V660_TEMPLATES);
32+
XPackRestTestHelper.waitForTemplates(client(), XPackRestTestConstants.ML_POST_V660_TEMPLATES);
3233
}
3334

3435
@Override

‎x-pack/qa/saml-idp-tests/build.gradle

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ apply plugin: 'elasticsearch.rest-test'
66
apply plugin: 'elasticsearch.test.fixtures'
77

88
dependencies {
9-
// "org.elasticsearch.plugin:x-pack-core:${version}" doesn't work with idea because the testArtifacts are also here
10-
testCompile project(path: xpackModule('core'), configuration: 'default')
119
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
12-
testCompile project(path: xpackModule('security'), configuration: 'testArtifacts')
1310
testCompile 'com.google.jimfs:jimfs:1.1'
1411
}
1512
testFixtures.useFixture ":x-pack:test:idp-fixture"
@@ -103,9 +100,7 @@ thirdPartyAudit {
103100
'com.google.common.cache.Striped64$1',
104101
'com.google.common.cache.Striped64$Cell',
105102
'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator',
106-
'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1',
107-
'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper',
108-
'com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper$1'
103+
'com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator$1'
109104
)
110105

111106
ignoreMissingClasses (

0 commit comments

Comments
 (0)