opendev/gerrit
Code Issues Proposed changes

GroupConfig: add a consistency check after loading a group

Browse Source 
Change-Id: I5743ac5262ec2e5ff7c6be17df9c4d4237d9b3fe
This commit is contained in:
Changcheng Xiao
2017-11-27 15:45:14 +01:00
parent 59fecfc6e3
commit 02058e1e78
7 changed files with 244 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
javatests/com/google/gerrit/acceptance/api/group/GroupsConsistencyIT.java
View File

@@ -31,20 +31,17 @@ import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.group.db.GroupConfig;
import com.google.gerrit.server.group.db.GroupNameNotes;
import com.google.gerrit.server.group.db.testing.GroupTestUtil;
import com.google.gerrit.server.notedb.GroupsMigration;
import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.testing.ConfigSuite;
import java.util.List;
import javax.inject.Inject;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefRename;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.RefUpdate.Result;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.junit.Before;
import org.junit.Test;
@@ -276,22 +273,8 @@ public class GroupsConsistencyIT extends AbstractDaemonTest {
fail(String.format("could not find %s substring '%s' in %s", want, msg, problems));
}
private void updateGroupFile(String refname, String filename, String contents) throws Exception {
try (Repository repo = repoManager.openRepository(allUsers);
RevWalk rw = new RevWalk(repo)) {
Ref ref = repo.exactRef(refname);
RevCommit c = rw.parseCommit(ref.getObjectId());
TestRepository<Repository> testRepository = new TestRepository<>(repo, rw);
testRepository
.branch(refname)
.commit()
.add(filename, contents)
.parent(c)
.message("update group file")
.author(serverIdent.get())
.committer(serverIdent.get())
.create();
}
private void updateGroupFile(String refName, String fileName, String content) throws Exception {
GroupTestUtil.updateGroupFile(
repoManager, allUsers, serverIdent.get(), refName, fileName, content);
}
}