opendev/gerrit
Code Issues Proposed changes

Fix ConsistencyCheckerIT in NoteDbMode.CHECK

Browse Source 
Mostly this amounts to skipping the tests that are explicitly testing
impossible conditions under NoteDb, like a missing repo. These cases
are already handled analogously (i.e. skipped with a warning) in the live
migration path.

In one case we need to slightly massage a Change that we are manually
inserting into ReviewDb to make it match NoteDb.

Change-Id: Ieaeaf8e75b66be52d04ce2fc1e7a8ce767f39dff
This commit is contained in:
Dave Borowitz
2017-07-14 14:09:13 -04:00
parent 1695d735f2
commit bcc0362a72
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java
View File

@@ -54,6 +54,7 @@ import com.google.gerrit.server.update.BatchUpdateOp;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gerrit.server.update.RepoContext;
import com.google.gerrit.testutil.InMemoryRepositoryManager;
import com.google.gerrit.testutil.NoteDbMode;
import com.google.gerrit.testutil.TestChanges;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
@@ -95,6 +96,11 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest {
private Account.Id adminId;
private ConsistencyChecker checker;
private void assumeNoteDbDisabled() {
assume().that(notesMigration.readChanges()).isFalse();
assume().that(NoteDbMode.get()).isNotEqualTo(NoteDbMode.CHECK);
}
@Before
public void setUp() throws Exception {
// Ignore client clone of project; repurpose as server-side TestRepository.
@@ -128,7 +134,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest {
@Test
public void missingRepo() throws Exception {
// NoteDb can't have a change without a repo.
assume().that(notesMigration.readChanges()).isFalse();
assumeNoteDbDisabled();
ChangeControl ctl = insertChange();
Project.NameKey name = ctl.getProject().getNameKey();
@@ -141,7 +147,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest {
public void invalidRevision() throws Exception {
// NoteDb always parses the revision when inserting a patch set, so we can't
// create an invalid patch set.
assume().that(notesMigration.readChanges()).isFalse();
assumeNoteDbDisabled();
ChangeControl ctl = insertChange();
PatchSet ps =
@@ -272,6 +278,10 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest {
@Test
public void onlyPatchSetObjectMissingWithFix() throws Exception {
Change c = TestChanges.newChange(project, admin.getId(), sequences.nextChangeId());
// Set review started, mimicking Schema_153, so tests pass with NoteDbMode.CHECK.
c.setReviewStarted(true);
PatchSet.Id psId = c.currentPatchSetId();
String rev = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef";
PatchSet ps = newPatchSet(psId, rev, adminId);
@@ -321,7 +331,7 @@ public class ConsistencyCheckerIT extends AbstractDaemonTest {
@Test
public void currentPatchSetMissing() throws Exception {
// NoteDb can't create a change without a patch set.
assume().that(notesMigration.readChanges()).isFalse();
assumeNoteDbDisabled();
ChangeControl ctl = insertChange();
db.patchSets().deleteKeys(singleton(ctl.getChange().currentPatchSetId()));