From d179fab54aec3ba50642b369fef175c97d6dc607 Mon Sep 17 00:00:00 2001 From: deepy Date: Tue, 10 Apr 2018 12:44:39 +0200 Subject: [PATCH 1/2] Query the documentation to check if plugin is enabled Instead of querying the plugin (which may give a redirect), query the plugin's Documentation. --- .../plugins/gerrit/trigger/utils/GerritPluginChecker.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/utils/GerritPluginChecker.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/utils/GerritPluginChecker.java index d9bf87ca8..cfdbf1442 100644 --- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/utils/GerritPluginChecker.java +++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/utils/GerritPluginChecker.java @@ -161,7 +161,8 @@ public static Boolean isPluginEnabled(IGerritHudsonTriggerConfig config, String CloseableHttpResponse execute = null; try { - execute = HttpUtils.performHTTPGet(config, restUrl + "plugins/" + pluginName + "/"); + execute = HttpUtils.performHTTPGet(config, + restUrl + "plugins/" + pluginName + "/Documentation/index.html"); int statusCode = execute.getStatusLine().getStatusCode(); logger.debug("status code: {}", statusCode); return decodeStatus(statusCode, pluginName, quiet); From f19bf0973d6a2a964097ae9a1d17f056fb694280 Mon Sep 17 00:00:00 2001 From: Alex Nordlund Date: Wed, 11 Apr 2018 15:28:43 +0200 Subject: [PATCH 2/2] Fixing broken tests. --- .../playback/GerritMissedEventsFunctionalTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/playback/GerritMissedEventsFunctionalTest.java b/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/playback/GerritMissedEventsFunctionalTest.java index b5d1baded..0cb430d51 100644 --- a/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/playback/GerritMissedEventsFunctionalTest.java +++ b/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/playback/GerritMissedEventsFunctionalTest.java @@ -110,12 +110,12 @@ public void setUp() throws Exception { server.returnCommandFor(GERRIT_STREAM_EVENTS, SshdServerMock.CommandMock.class); server.returnCommandFor("gerrit review.*", SshdServerMock.EofCommandMock.class); server.returnCommandFor("gerrit version", SshdServerMock.EofCommandMock.class); - stubFor(get(urlEqualTo("/plugins/" + GerritMissedEventsPlaybackManager.EVENTS_LOG_PLUGIN_NAME + "/")) + stubFor(get(urlEqualTo("/plugins/" + GerritMissedEventsPlaybackManager.EVENTS_LOG_PLUGIN_NAME + + "/Documentation/index.html")) .willReturn(aResponse() .withStatus(HTTPOK) .withHeader("Content-Type", "text/html") .withBody("ok"))); - } /** @@ -202,7 +202,8 @@ public void testLosePluginSupportedWithEventsAndRestart() throws Exception { EventTimeSlice lastTimeStamp = gerritServer.getMissedEventsPlaybackManager().getServerTimestamp(); // now we force the plugin is supported to false... - stubFor(get(urlEqualTo("/plugins/" + GerritMissedEventsPlaybackManager.EVENTS_LOG_PLUGIN_NAME + "/")) + stubFor(get(urlEqualTo("/plugins/" + GerritMissedEventsPlaybackManager.EVENTS_LOG_PLUGIN_NAME + + "/Documentation/index.html")) .willReturn(aResponse() .withStatus(HTTPERROR) .withHeader("Content-Type", "text/html") @@ -222,7 +223,8 @@ public void testLosePluginSupportedWithEventsAndRestart() throws Exception { Thread.sleep(SLEEPTIME); // now we re-enable feature: - stubFor(get(urlEqualTo("/plugins/" + GerritMissedEventsPlaybackManager.EVENTS_LOG_PLUGIN_NAME + "/")) + stubFor(get(urlEqualTo("/plugins/" + GerritMissedEventsPlaybackManager.EVENTS_LOG_PLUGIN_NAME + + "/Documentation/index.html")) .willReturn(aResponse() .withStatus(HTTPOK) .withHeader("Content-Type", "text/html")