honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-enable data stream bwc tests (#59734) 

after backporting #59503
Backport of #59732 yo 7.x
This commit is contained in:
Martijn van Groningen 2020-07-16 23:59:52 +02:00 committed by GitHub
parent 0096238df1
commit 74c9402912
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -871,7 +871,6 @@ public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void testDataStreams() throws Exception { public void testDataStreams() throws Exception {
assumeTrue("fail until #59503 is backported to 7.x and 7.9", false);
assumeTrue("no data streams in versions before " + Version.V_7_9_0, getOldClusterVersion().onOrAfter(Version.V_7_9_0)); assumeTrue("no data streams in versions before " + Version.V_7_9_0, getOldClusterVersion().onOrAfter(Version.V_7_9_0));
if (isRunningAgainstOldCluster()) { if (isRunningAgainstOldCluster()) {
createComposableTemplate(client(), "dst", "ds"); createComposableTemplate(client(), "dst", "ds");

2
x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/DataStreamsUpgradeIT.java
View File

@ -19,7 +19,7 @@ import static org.elasticsearch.upgrades.IndexingIT.assertCount;
public class DataStreamsUpgradeIT extends AbstractUpgradeTestCase { public class DataStreamsUpgradeIT extends AbstractUpgradeTestCase {
public void testDataStreams() throws IOException { public void testDataStreams() throws IOException {
assumeTrue("fail until #59503 is backported to 7.x and 7.9", false); assumeTrue("no data streams in versions before " + Version.V_7_9_0, UPGRADE_FROM_VERSION.onOrAfter(Version.V_7_9_0));
assumeTrue("data streams supported from 7.9.0", UPGRADE_FROM_VERSION.onOrAfter(Version.V_7_9_0)); assumeTrue("data streams supported from 7.9.0", UPGRADE_FROM_VERSION.onOrAfter(Version.V_7_9_0));
if (CLUSTER_TYPE == ClusterType.OLD) { if (CLUSTER_TYPE == ClusterType.OLD) {
String requestBody = "{\n" + String requestBody = "{\n" +