diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java index 85ec5d59c4..7dbbfb5828 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java @@ -233,12 +233,22 @@ public abstract class AbstractDaemonTest { return cfg.getBoolean("change", null, "submitWholeTopic", false); } + private static boolean isNoteDbTestEnabled() { + final String[] RUN_FLAGS = {"yes", "y", "true"}; + String value = System.getenv("GERRIT_ENABLE_NOTEDB"); + return value != null && + Arrays.asList(RUN_FLAGS).contains(value.toLowerCase()); + } + protected void beforeTest(Description description) throws Exception { GerritServer.Description classDesc = GerritServer.Description.forTestClass(description, configName); GerritServer.Description methodDesc = GerritServer.Description.forTestMethod(description, configName); + if (isNoteDbTestEnabled()) { + NotesMigration.setAllEnabledConfig(baseConfig); + } baseConfig.setString("gerrit", null, "tempSiteDir", tempSiteDir.getRoot().getPath()); if (classDesc.equals(methodDesc)) { diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java index 4996dd8425..900d85a818 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -31,10 +31,7 @@ import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.EditInfo; import com.google.gerrit.extensions.common.LabelInfo; import com.google.gerrit.reviewdb.client.Change; -import com.google.gerrit.server.notedb.NotesMigration; -import com.google.gerrit.testutil.ConfigSuite; -import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.revwalk.RevCommit; import org.joda.time.DateTime; import org.joda.time.DateTimeUtils; @@ -48,11 +45,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicLong; public abstract class AbstractPushForReview extends AbstractDaemonTest { - @ConfigSuite.Config - public static Config noteDbEnabled() { - return NotesMigration.allEnabledConfig(); - } - protected enum Protocol { // TODO(dborowitz): TEST. SSH, HTTP 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 e8924293f7..a9a7dfadbf 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 @@ -35,30 +35,19 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.edit.ChangeEditModifier; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.project.Util; -import com.google.gerrit.testutil.ConfigSuite; import com.google.inject.Inject; -import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; -@RunWith(ConfigSuite.class) @NoHttpd public class VisibleRefFilterIT extends AbstractDaemonTest { - @ConfigSuite.Config - public static Config noteDbWriteEnabled() { - Config cfg = new Config(); - cfg.setBoolean("notedb", "changes", "write", true); - return cfg; - } - @Inject private ChangeEditModifier editModifier; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java index a56a7f2e82..d726d70828 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java @@ -22,10 +22,8 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.extensions.api.changes.ReviewInput; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.ChangeMessageInfo; -import com.google.gerrit.server.notedb.NotesMigration; import com.google.gerrit.testutil.ConfigSuite; -import org.eclipse.jgit.lib.Config; import org.joda.time.DateTime; import org.joda.time.DateTimeUtils; import org.joda.time.DateTimeUtils.MillisProvider; @@ -42,11 +40,6 @@ public class ChangeMessagesIT extends AbstractDaemonTest { private String systemTimeZone; private volatile long clockStepMs; - @ConfigSuite.Config - public static Config noteDbEnabled() { - return NotesMigration.allEnabledConfig(); - } - @Before public void setTimeForTesting() { systemTimeZone = System.setProperty("user.timezone", "US/Eastern"); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java index 6ef53ffadc..aa7305a340 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java @@ -15,6 +15,7 @@ package com.google.gerrit.acceptance.rest.change; import static com.google.common.truth.Truth.assertThat; +import static com.google.common.truth.TruthJUnit.assume; import com.google.common.collect.Sets; import com.google.common.truth.IterableSubject; @@ -22,17 +23,15 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.acceptance.PushOneCommit; import com.google.gerrit.extensions.api.changes.HashtagsInput; -import com.google.gerrit.server.notedb.NotesMigration; -import com.google.gerrit.testutil.ConfigSuite; -import org.eclipse.jgit.lib.Config; +import org.junit.Before; import org.junit.Test; @NoHttpd public class HashtagsIT extends AbstractDaemonTest { - @ConfigSuite.Default - public static Config defaultConfig() { - return NotesMigration.allEnabledConfig(); + @Before + public void before() { + assume().that(notesMigration.enabled()).isTrue(); } @Test diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java index 721c71236c..5592755dc6 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/CommentsIT.java @@ -39,14 +39,11 @@ import com.google.gerrit.server.change.ChangesCollection; import com.google.gerrit.server.change.PostReview; import com.google.gerrit.server.change.RevisionResource; import com.google.gerrit.server.change.Revisions; -import com.google.gerrit.server.notedb.NotesMigration; -import com.google.gerrit.testutil.ConfigSuite; import com.google.gerrit.testutil.FakeEmailSender; import com.google.gerrit.testutil.FakeEmailSender.Message; import com.google.inject.Inject; import com.google.inject.Provider; -import org.eclipse.jgit.lib.Config; import org.junit.Before; import org.junit.Test; @@ -57,11 +54,6 @@ import java.util.Map; @NoHttpd public class CommentsIT extends AbstractDaemonTest { - @ConfigSuite.Config - public static Config noteDbEnabled() { - return NotesMigration.allEnabledConfig(); - } - @Inject private Provider changes; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java index 5d31c77259..363a7e4bfd 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java @@ -26,22 +26,14 @@ import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.LabelInfo; import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.ProjectConfig; -import com.google.gerrit.server.notedb.NotesMigration; import com.google.gerrit.server.project.Util; -import com.google.gerrit.testutil.ConfigSuite; -import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Repository; import org.junit.Before; import org.junit.Test; @NoHttpd public class LabelTypeIT extends AbstractDaemonTest { - @ConfigSuite.Config - public static Config noteDbEnabled() { - return NotesMigration.allEnabledConfig(); - } - private LabelType codeReview; @Before diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigration.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigration.java index e6d9ff89bc..d63f972bed 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigration.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigration.java @@ -84,11 +84,15 @@ public class NotesMigration { public static Config allEnabledConfig() { Config cfg = new Config(); + setAllEnabledConfig(cfg); + return cfg; + } + + public static void setAllEnabledConfig(Config cfg) { for (Table t : Table.values()) { cfg.setBoolean(NOTEDB, t.key(), WRITE, true); cfg.setBoolean(NOTEDB, t.key(), READ, true); } - return cfg; } private final boolean writeChanges;