Skip to content

Commit 1c0474e

Browse files
authored
Fix flaky DesiredNodeTests#testGetRoles (#85891)
Exclude VOTING_ONLY_NODE_ROLE from the list of randomy picked roles as it could not be used in isolation without MASTER role
1 parent 99ab687 commit 1c0474e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

server/src/test/java/org/elasticsearch/cluster/metadata/DesiredNodeTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.common.unit.ByteSizeValue;
1515
import org.elasticsearch.test.ESTestCase;
1616

17+
import static org.elasticsearch.cluster.node.DiscoveryNodeRole.VOTING_ONLY_NODE_ROLE;
1718
import static org.elasticsearch.node.Node.NODE_EXTERNAL_ID_SETTING;
1819
import static org.elasticsearch.node.Node.NODE_NAME_SETTING;
1920
import static org.elasticsearch.node.NodeRoleSettings.NODE_ROLES_SETTING;
@@ -90,11 +91,10 @@ public void testHasMasterRole() {
9091
}
9192
}
9293

93-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/85882")
9494
public void testGetRoles() {
9595
final var settings = Settings.builder().put(NODE_NAME_SETTING.getKey(), randomAlphaOfLength(10));
9696

97-
final var role = randomBoolean() ? null : randomFrom(DiscoveryNodeRole.roles());
97+
final var role = randomBoolean() ? null : randomValueOtherThan(VOTING_ONLY_NODE_ROLE, () -> randomFrom(DiscoveryNodeRole.roles()));
9898
if (role != null) {
9999
settings.put(NODE_ROLES_SETTING.getKey(), role.roleName());
100100
}

0 commit comments

Comments
 (0)