Deactivate HTTP daemon for tests that don't need it Change-Id: I84be817fa322181aa24618d225fbf2ac75956c6d
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java index d1803c2..77a7a91 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java
@@ -22,6 +22,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.Ordering; import com.google.gerrit.acceptance.AbstractDaemonTest; +import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.GlobalCapability; @@ -52,6 +53,7 @@ import java.util.List; @RunWith(ConfigSuite.class) +@NoHttpd public class VisibleRefFilterIT extends AbstractDaemonTest { @ConfigSuite.Config public static Config noteDbWriteEnabled() {
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java index 70a0a60..7b92f52 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNull; import com.google.gerrit.acceptance.AbstractDaemonTest; +import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.GitUtil.Commit; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace; @@ -43,6 +44,7 @@ import java.io.IOException; import java.util.List; +@NoHttpd public class PatchListCacheIT extends AbstractDaemonTest { private static String SUBJECT_1 = "subject 1"; private static String SUBJECT_2 = "subject 2";
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BanCommitIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BanCommitIT.java index 1bd1b71..6093f30 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BanCommitIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BanCommitIT.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue; import com.google.gerrit.acceptance.AbstractDaemonTest; +import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.GitUtil.Commit; import com.jcraft.jsch.JSchException; @@ -32,6 +33,7 @@ import java.io.IOException; import java.util.Locale; +@NoHttpd public class BanCommitIT extends AbstractDaemonTest { @Test
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java index cc146d6a..1a46773 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java
@@ -21,6 +21,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.GcAssert; +import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.SshSession; import com.google.gerrit.acceptance.UseLocalDisk; import com.google.gerrit.common.data.GarbageCollectionResult; @@ -39,6 +40,7 @@ import java.util.Arrays; import java.util.Locale; +@NoHttpd public class GarbageCollectionIT extends AbstractDaemonTest { @Inject