Skip to content

watcher - remove types from full cluster restart tests #48014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2019
Merged

watcher - remove types from full cluster restart tests #48014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions ...l-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@

public class FullClusterRestartIT extends AbstractFullClusterRestartTestCase {

public static final String INDEX_ACTION_TYPES_DEPRECATION_MESSAGE =
"[types removal] Specifying types in a watcher index action is deprecated.";

public static final int UPGRADE_FIELD_EXPECTED_INDEX_FORMAT_VERSION = 6;
public static final int SECURITY_EXPECTED_INDEX_FORMAT_VERSION = 6;

Expand Down Expand Up @@ -121,10 +118,7 @@ public void testWatcher() throws Exception {
logger.info("Adding a watch on old cluster {}", getOldClusterVersion());
Request createBwcWatch = new Request("PUT", getWatcherEndpoint() + "/watch/bwc_watch");
Request createBwcThrottlePeriod = new Request("PUT", getWatcherEndpoint() + "/watch/bwc_throttle_period");
if (getOldClusterVersion().onOrAfter(Version.V_7_0_0)) {
createBwcWatch.setOptions(expectWarnings(INDEX_ACTION_TYPES_DEPRECATION_MESSAGE));
createBwcThrottlePeriod.setOptions(expectWarnings(INDEX_ACTION_TYPES_DEPRECATION_MESSAGE));
}

createBwcWatch.setJsonEntity(loadWatch("simple-watch.json"));
client().performRequest(createBwcWatch);

Expand Down Expand Up @@ -285,11 +279,6 @@ private void assertOldTemplatesAreDeleted() throws IOException {
private void assertWatchIndexContentsWork() throws Exception {
// Fetch a basic watch
Request getRequest = new Request("GET", "_watcher/watch/bwc_watch");
getRequest.setOptions(
expectWarnings(
INDEX_ACTION_TYPES_DEPRECATION_MESSAGE
)
);

Map<String, Object> bwcWatch = entityAsMap(client().performRequest(getRequest));

Expand All @@ -306,11 +295,6 @@ private void assertWatchIndexContentsWork() throws Exception {

// Fetch a watch with "fun" throttle periods
getRequest = new Request("GET", "_watcher/watch/bwc_throttle_period");
getRequest.setOptions(
expectWarnings(
INDEX_ACTION_TYPES_DEPRECATION_MESSAGE
)
);

bwcWatch = entityAsMap(client().performRequest(getRequest));
assertThat(bwcWatch.get("found"), equalTo(true));
Expand Down
1 change: 0 additions & 1 deletion ...full-cluster-restart/src/test/resources/org/elasticsearch/xpack/restart/simple-watch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
},
"index" : {
"index" : "bwc_watch_index",
"doc_type" : "bwc_watch_type",
"timeout": "100s"
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...ter-restart/src/test/resources/org/elasticsearch/xpack/restart/throttle-period-watch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
}
},
"index" : {
"index" : "bwc_watch_index",
"doc_type" : "bwc_watch_type"
"index" : "bwc_watch_index"
}
}
}
Expand Down