opendev/gerrit
Code Issues Proposed changes

Deactivate HTTP daemon for tests that don't need it

Browse Source 
Change-Id: I84be817fa322181aa24618d225fbf2ac75956c6d
This commit is contained in:
David Ostrovsky
2014-10-11 01:46:06 +02:00
committed by David Pursehouse
parent 240d270b85
commit b810da2053
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java
View File

@@ -22,6 +22,7 @@ import com.google.common.base.CharMatcher;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.collect.Ordering; import com.google.common.collect.Ordering;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.common.data.AccessSection;
import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.common.data.GlobalCapability;
@@ -52,6 +53,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@RunWith(ConfigSuite.class) @RunWith(ConfigSuite.class)
@NoHttpd
public class VisibleRefFilterIT extends AbstractDaemonTest { public class VisibleRefFilterIT extends AbstractDaemonTest {
@ConfigSuite.Config @ConfigSuite.Config
public static Config noteDbWriteEnabled() { public static Config noteDbWriteEnabled() {

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java
View File

@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.GitUtil.Commit; import com.google.gerrit.acceptance.GitUtil.Commit;
import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace; import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace;
@@ -43,6 +44,7 @@ import org.junit.Test;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
@NoHttpd
public class PatchListCacheIT extends AbstractDaemonTest { public class PatchListCacheIT extends AbstractDaemonTest {
private static String SUBJECT_1 = "subject 1"; private static String SUBJECT_1 = "subject 1";
private static String SUBJECT_2 = "subject 2"; private static String SUBJECT_2 = "subject 2";

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BanCommitIT.java
View File

@@ -21,6 +21,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.GitUtil.Commit; import com.google.gerrit.acceptance.GitUtil.Commit;
import com.jcraft.jsch.JSchException; import com.jcraft.jsch.JSchException;
@@ -32,6 +33,7 @@ import org.junit.Test;
import java.io.IOException; import java.io.IOException;
import java.util.Locale; import java.util.Locale;
@NoHttpd
public class BanCommitIT extends AbstractDaemonTest { public class BanCommitIT extends AbstractDaemonTest {
@Test @Test

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java
View File

@@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue;
import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.GcAssert; import com.google.gerrit.acceptance.GcAssert;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.SshSession; import com.google.gerrit.acceptance.SshSession;
import com.google.gerrit.acceptance.UseLocalDisk; import com.google.gerrit.acceptance.UseLocalDisk;
import com.google.gerrit.common.data.GarbageCollectionResult; import com.google.gerrit.common.data.GarbageCollectionResult;
@@ -39,6 +40,7 @@ import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale; import java.util.Locale;
@NoHttpd
public class GarbageCollectionIT extends AbstractDaemonTest { public class GarbageCollectionIT extends AbstractDaemonTest {
@Inject @Inject