opendev/gerrit
Code Issues Proposed changes

GerritServerTests: Support GERRIT_ENABLE_NOTEDB=1

Browse Source 
While we're in there, use a more idiomatic ImmutableList constructor
rather than String[].

Change-Id: Iafbb080a4ebf418c528a76159621d2bdd53a03c8
This commit is contained in:
Dave Borowitz
2015-12-21 15:27:25 -05:00
parent 2486fa573e
commit 528e52d7e4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/test/java/com/google/gerrit/testutil/GerritServerTests.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.testutil; package com.google.gerrit.testutil;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.server.notedb.NotesMigration; import com.google.gerrit.server.notedb.NotesMigration;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
@@ -23,7 +24,7 @@ import org.junit.runner.Description;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.model.Statement; import org.junit.runners.model.Statement;
import java.util.Arrays; import java.util.List;
@RunWith(ConfigSuite.class) @RunWith(ConfigSuite.class)
public class GerritServerTests extends GerritBaseTests { public class GerritServerTests extends GerritBaseTests {
@@ -34,10 +35,9 @@ public class GerritServerTests extends GerritBaseTests {
private String configName; private String configName;
public static boolean isNoteDbTestEnabled() { public static boolean isNoteDbTestEnabled() {
final String[] RUN_FLAGS = {"yes", "y", "true"}; List<String> runValues = ImmutableList.of("yes", "y", "true", "1");
String value = System.getenv("GERRIT_ENABLE_NOTEDB"); String value = System.getenv("GERRIT_ENABLE_NOTEDB");
return value != null && return value != null && runValues.contains(value.toLowerCase());
Arrays.asList(RUN_FLAGS).contains(value.toLowerCase());
} }
@Rule @Rule