From 9bfd1721caedd0a0dab8caa155d46088d011a8f8 Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Tue, 18 Oct 2016 22:00:03 +0200
Subject: [PATCH] Fix SecurityTribeIT to properly add mock plugins in tribe
 node

Original commit: elastic/x-pack-elasticsearch@e82c39c5c413d01353fa524274de88491417753e
---
 .../org/elasticsearch/xpack/security/SecurityTribeIT.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/SecurityTribeIT.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/SecurityTribeIT.java
index 79ead36d733..75cc47c451e 100644
--- a/elasticsearch/src/test/java/org/elasticsearch/xpack/security/SecurityTribeIT.java
+++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/security/SecurityTribeIT.java
@@ -158,9 +158,9 @@ public class SecurityTribeIT extends NativeRealmIntegTestCase {
                 .put("node.name", "tribe_node") // make sure we can identify threads from this node
                 .build();
 
-        final Collection<Class<? extends Plugin>> plugins = new ArrayList<>(nodePlugins());
-        plugins.add(MockZenPing.TestPlugin.class);
-        tribeNode = new MockNode(merged, plugins).start();
+        final List<Class<? extends Plugin>> classpathPlugins = new ArrayList<>(nodePlugins());
+        classpathPlugins.addAll(getMockPlugins());
+        tribeNode = new MockNode(merged, classpathPlugins).start();
         tribeClient = getClientWrapper().apply(tribeNode.client());
     }