opendev/gerrit
Code Issues Proposed changes

Disable hashtag tests under GERRIT_NOTEDB=write

Browse Source 
For hashtags we require reading changes to be enabled; we will still
get no values if only writing is enabled, but notesMigration() will
still be true in that case.

Change-Id: I60dbdf94227a7deb28adfc06a4a9f14b91fc129d
This commit is contained in:
Dave Borowitz
2016-05-05 17:50:42 -04:00
parent 071e32506b
commit c2ca86c10a
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
View File

@@ -399,9 +399,8 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
@Test @Test
public void testPushForMasterWithHashtags() throws Exception { public void testPushForMasterWithHashtags() throws Exception {
// Hashtags only work when reading from NoteDB is enabled
// Hashtags currently only work when noteDB is enabled assume().that(notesMigration.readChanges()).isTrue();
assume().that(notesMigration.enabled()).isTrue();
// specify a single hashtag as option // specify a single hashtag as option
String hashtag1 = "tag1"; String hashtag1 = "tag1";
@@ -427,9 +426,8 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
@Test @Test
public void testPushForMasterWithMultipleHashtags() throws Exception { public void testPushForMasterWithMultipleHashtags() throws Exception {
// Hashtags only work when reading from NoteDB is enabled
// Hashtags currently only work when noteDB is enabled assume().that(notesMigration.readChanges()).isTrue();
assume().that(notesMigration.enabled()).isTrue();
// specify multiple hashtags as options // specify multiple hashtags as options
String hashtag1 = "tag1"; String hashtag1 = "tag1";

2
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
View File

@@ -38,7 +38,7 @@ import org.junit.Test;
public class HashtagsIT extends AbstractDaemonTest { public class HashtagsIT extends AbstractDaemonTest {
@Before @Before
public void before() { public void before() {
assume().that(notesMigration.enabled()).isTrue(); assume().that(notesMigration.readChanges()).isTrue();
} }
@BeforeClass @BeforeClass

2
gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
View File

@@ -1071,7 +1071,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
@Test @Test
public void byHashtagWithNoteDb() throws Exception { public void byHashtagWithNoteDb() throws Exception {
assume().that(notesMigration.enabled()).isTrue(); assume().that(notesMigration.readChanges()).isTrue();
List<Change> changes = setUpHashtagChanges(); List<Change> changes = setUpHashtagChanges();
assertQuery("hashtag:foo", changes.get(1), changes.get(0)); assertQuery("hashtag:foo", changes.get(1), changes.get(0));
assertQuery("hashtag:bar", changes.get(1)); assertQuery("hashtag:bar", changes.get(1));