Skip to content

Commit 670c94d

Browse files
Fix UnregisteredSettingsIntegTests
1 parent 2a21640 commit 670c94d

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/UnregisteredSettingsIntegTests.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,28 @@
1111
import org.elasticsearch.test.ESIntegTestCase;
1212
import org.elasticsearch.test.SecurityIntegTestCase;
1313

14+
import java.io.IOException;
15+
1416
import static org.elasticsearch.test.NodeRoles.dataOnlyNode;
1517
import static org.elasticsearch.test.NodeRoles.masterNode;
1618
import static org.hamcrest.Matchers.containsString;
1719

1820
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, autoManageMasterNodes = false)
1921
public class UnregisteredSettingsIntegTests extends SecurityIntegTestCase {
2022

21-
public void testIncludeReservedRolesSettingNotRegistered() {
23+
public void testIncludeReservedRolesSettingNotRegistered() throws IOException {
2224
internalCluster().setBootstrapMasterNodeIndex(0);
2325

2426
final Settings.Builder builder = Settings.builder()
2527
.put(randomBoolean() ? masterNode() : dataOnlyNode())
2628
.putList("xpack.security.reserved_roles.include", "superuser");
2729

28-
final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> internalCluster().startNode(builder));
29-
assertThat(e.getMessage(), containsString("unknown setting [xpack.security.reserved_roles.include]"));
30+
try {
31+
final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> internalCluster().startNode(builder));
32+
assertThat(e.getMessage(), containsString("unknown setting [xpack.security.reserved_roles.include]"));
33+
} finally {
34+
internalCluster().close();
35+
}
3036
}
3137

3238
public void testSamlExcludeRolesSettingNotRegistered() throws Exception {
@@ -36,7 +42,11 @@ public void testSamlExcludeRolesSettingNotRegistered() throws Exception {
3642
.put(randomBoolean() ? masterNode() : dataOnlyNode())
3743
.putList("xpack.security.authc.realms.saml.saml1.exclude_roles", "superuser");
3844

39-
final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> internalCluster().startNode(builder));
40-
assertThat(e.getMessage(), containsString("unknown setting [xpack.security.authc.realms.saml.saml1.exclude_roles]"));
45+
try {
46+
final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> internalCluster().startNode(builder));
47+
assertThat(e.getMessage(), containsString("unknown setting [xpack.security.authc.realms.saml.saml1.exclude_roles]"));
48+
} finally {
49+
internalCluster().close();
50+
}
4151
}
4252
}

0 commit comments

Comments
 (0)