Skip to content

Commit db79de8

Browse files
Revert "Safer Wait for Snapshot Success in ClusterPrivilegeTests"
This reverts commit b3871f3.
1 parent 5a3cb51 commit db79de8

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

x-pack/plugin/security/src/test/java/org/elasticsearch/integration/ClusterPrivilegeTests.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
package org.elasticsearch.integration;
77

88
import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotsStatusResponse;
9-
import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
109
import org.elasticsearch.client.Request;
1110
import org.elasticsearch.cluster.SnapshotsInProgress;
1211
import org.elasticsearch.common.Strings;
1312
import org.elasticsearch.common.settings.SecureString;
1413
import org.elasticsearch.common.settings.Settings;
1514
import org.elasticsearch.xpack.core.security.authc.support.Hasher;
16-
import org.hamcrest.Matchers;
1715
import org.junit.AfterClass;
1816
import org.junit.BeforeClass;
1917

@@ -206,12 +204,5 @@ private void waitForSnapshotToFinish(String repo, String snapshot) throws Except
206204
SnapshotsStatusResponse response = client().admin().cluster().prepareSnapshotStatus(repo).setSnapshots(snapshot).get();
207205
assertThat(response.getSnapshots().get(0).getState(), is(SnapshotsInProgress.State.SUCCESS));
208206
});
209-
// The status of the snapshot in the repository can become SUCCESS before it is fully finalized in the cluster state so wait for
210-
// it to disappear from the cluster state as well
211-
assertBusy(() -> {
212-
SnapshotsInProgress response =
213-
client().admin().cluster().state(new ClusterStateRequest()).get().getState().custom(SnapshotsInProgress.TYPE);
214-
assertThat(response.entries(), Matchers.empty());
215-
});
216207
}
217208
}

0 commit comments

Comments
 (0)