Remove `@NoHttpd` from IT tests that interact with Gerrit Rest API The "@NoHttpd" annotation did not function as expected in "Gerrit stable-3.6" until the fix was introduce as a part of change 379201. Subsequently, all tests reliant on the Gerrit Rest API began to fail. Change-Id: I399495d4b0debac8b340657baf577bb085be4eec
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/ProjectListIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/ProjectListIT.java index 98cdce5..36c775c 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/ProjectListIT.java +++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/ProjectListIT.java
@@ -26,7 +26,6 @@ import com.github.tomakehurst.wiremock.junit.WireMockRule; import com.google.gerrit.acceptance.LightweightPluginDaemonTest; -import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseLocalDisk; import com.google.gerrit.acceptance.config.GlobalPluginConfig; @@ -37,7 +36,6 @@ import org.junit.Rule; import org.junit.Test; -@NoHttpd @TestPlugin( name = "high-availability", sysModule = "com.ericsson.gerrit.plugins.highavailability.Module",
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ProjectListRestApiServletIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ProjectListRestApiServletIT.java index 11ae77d..e838cb3 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ProjectListRestApiServletIT.java +++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/ProjectListRestApiServletIT.java
@@ -17,14 +17,12 @@ import static com.google.common.truth.Truth.assertThat; import com.google.gerrit.acceptance.LightweightPluginDaemonTest; -import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseLocalDisk; import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.restapi.Url; import org.junit.Test; -@NoHttpd @TestPlugin( name = "high-availability", sysModule = "com.ericsson.gerrit.plugins.highavailability.Module",
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModuleIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModuleIT.java index 0092902..2406443 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModuleIT.java +++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/rest/RestForwarderServletModuleIT.java
@@ -17,14 +17,12 @@ import com.ericsson.gerrit.plugins.highavailability.forwarder.TestEvent; import com.google.common.base.Joiner; import com.google.gerrit.acceptance.LightweightPluginDaemonTest; -import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.TestPlugin; import com.google.gerrit.acceptance.UseLocalDisk; import com.google.gerrit.server.events.Event; import javax.servlet.http.HttpServletResponse; import org.junit.Test; -@NoHttpd @TestPlugin( name = "high-availability", sysModule = "com.ericsson.gerrit.plugins.highavailability.Module",