Skip to content

Commit

Permalink
Fixing failing RestResizeHandlerTests in 1.x
Browse files Browse the repository at this point in the history
Signed-off-by: Vacha Shah <vachshah@amazon.com>
  • Loading branch information
VachaShah committed Mar 3, 2022
1 parent 4ef2a35 commit beec85f
Showing 1 changed file with 8 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,18 @@

import java.io.IOException;
import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;

import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasToString;
import static org.mockito.Mockito.mock;

public class RestResizeHandlerTests extends OpenSearchTestCase {

private Set<String> assertedWarnings = new HashSet<>();

public void testShrinkCopySettingsDeprecated() throws IOException {
final RestResizeHandler.RestShrinkIndexAction handler = new RestResizeHandler.RestShrinkIndexAction();
for (final String copySettings : new String[] { null, "", "true", "false" }) {
Expand Down Expand Up @@ -80,9 +84,11 @@ private void runTestResizeCopySettingsDeprecated(
);
assertThat(e, hasToString(containsString("parameter [copy_settings] can not be explicitly set to [false]")));
} else {
String expectedWarning = "parameter [copy_settings] is deprecated and will be removed in 8.0.0";
handler.prepareRequest(request, mock(NodeClient.class));
if ("".equals(copySettings) || "true".equals(copySettings)) {
assertWarnings("parameter [copy_settings] is deprecated and will be removed in 8.0.0");
if (("".equals(copySettings) || "true".equals(copySettings)) && !assertedWarnings.contains(expectedWarning)) {
assertWarnings(expectedWarning);
assertedWarnings.add(expectedWarning);
}
}
}
Expand Down

0 comments on commit beec85f

Please sign in to comment.