From eacd0419f7b9400f97592343577a0e28a5a3c9f6 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Wed, 16 Dec 2015 17:14:10 -0500 Subject: [PATCH] Fix the running of plugin acceptance tests in eclipse such as CookbookIT Since the previous master commit 58cb4b4 introduced eclipse-out, running plugin IT such as CookbookIT is broken. (Before that commit, only buck-out was used.) This is to fix PluginDaemonTest so it properly supports that new eclipse-out alongside the other modes, buck tree and standalone. Change-Id: I32591559ed00012d378bbac12c7391d5d8ffc490 --- .../java/com/google/gerrit/acceptance/PluginDaemonTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PluginDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PluginDaemonTest.java index 4c77edc586..c71e13fa86 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PluginDaemonTest.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/PluginDaemonTest.java @@ -41,6 +41,7 @@ public abstract class PluginDaemonTest extends AbstractDaemonTest { private static final String BUCKLC = "buck"; private static final String BUCKOUT = "buck-out"; + private static final String ECLIPSE = "eclipse-out"; private Path gen; private Path pluginRoot; @@ -98,7 +99,7 @@ public abstract class PluginDaemonTest extends AbstractDaemonTest { if (subPath.endsWith("plugins")) { pluginsIdx = idx; } - if (subPath.endsWith(BUCKOUT)) { + if (subPath.endsWith(BUCKOUT) || subPath.endsWith(ECLIPSE)) { buckOutIdx = idx; } idx++; @@ -126,7 +127,8 @@ public abstract class PluginDaemonTest extends AbstractDaemonTest { String gerritDirCandidate = partialPath.subpath(count - 2, count - 1).toString(); if (pattern.matcher(gerritDirCandidate).matches()) { - if (partialPath.endsWith(gerritDirCandidate + "/" + BUCKOUT)) { + if (partialPath.endsWith(gerritDirCandidate + "/" + BUCKOUT) || + partialPath.endsWith(gerritDirCandidate + "/" + ECLIPSE)) { return false; } }