From 4de57fc5aac31c3a907529a1b932c934cdf611f6 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 28 Mar 2016 13:48:28 -0400 Subject: [PATCH] Simplify test out of order commit messages --- .../publish/PublishClusterStateActionTests.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateActionTests.java b/core/src/test/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateActionTests.java index e1cb66555d1..5d18e271183 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateActionTests.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/publish/PublishClusterStateActionTests.java @@ -668,19 +668,9 @@ public class PublishClusterStateActionTests extends ESTestCase { } final ClusterState finalState = states.get(numOfStates - 1); - Collections.shuffle(states, random()); - - List orderedSubsequence = new ArrayList<>(); - long version = 0; - for (ClusterState state : states) { - if (state.version() >= version) { - orderedSubsequence.add(state); - version = state.version(); - } - } logger.info("--> publishing states"); - for (ClusterState state : orderedSubsequence) { + for (ClusterState state : states) { node.action.handleIncomingClusterStateRequest( new BytesTransportRequest(PublishClusterStateAction.serializeFullClusterState(state, Version.CURRENT), Version.CURRENT), channel); @@ -691,8 +681,8 @@ public class PublishClusterStateActionTests extends ESTestCase { logger.info("--> committing states"); - Randomness.shuffle(orderedSubsequence); - for (ClusterState state : orderedSubsequence) { + Randomness.shuffle(states); + for (ClusterState state : states) { node.action.handleCommitRequest(new PublishClusterStateAction.CommitClusterStateRequest(state.stateUUID()), channel); assertThat(channel.response.get(), equalTo((TransportResponse) TransportResponse.Empty.INSTANCE)); if (channel.error.get() != null) {