From 7bc4a35f9a304547d209ecbfafc406e2df4904dd Mon Sep 17 00:00:00 2001 From: javanna Date: Fri, 25 Mar 2016 10:47:02 +0100 Subject: [PATCH] adapt ZenDiscoveryUnitTests to removal of INGEST_ATTR, MASTER_ATTR and DATA_ATTR --- .../elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java index 468d01aaecb..bce7a25001b 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java @@ -105,9 +105,8 @@ public class ZenDiscoveryUnitTests extends ESTestCase { ArrayList allNodes = new ArrayList<>(); for (int i = randomIntBetween(10, 20); i >= 0; i--) { Map attrs = new HashMap<>(); - for (String attr : randomSubsetOf( - Arrays.asList(DiscoveryNode.INGEST_ATTR, DiscoveryNode.DATA_ATTR, DiscoveryNode.MASTER_ATTR))) { - attrs.put(attr, randomBoolean() + ""); + for (DiscoveryNode.Role role : randomSubsetOf(Arrays.asList(DiscoveryNode.Role.values()))) { + attrs.put(role.getRoleName(), Boolean.toString(randomBoolean())); } DiscoveryNode node = new DiscoveryNode("node_" + i, "id_" + i, DummyTransportAddress.INSTANCE, attrs, Version.CURRENT);