opendev/gerrit
Code Issues Proposed changes

Fix compilation errors in LabelTypeIT

Browse Source 
The changes merged up from stable-2.11 don't compile on master
due to the modifications that were made in the acceptance test
framework.

Change-Id: I3cbde3513c246c8d83e6c0e936dc9bd879fc5df6
This commit is contained in:
David Pursehouse
2015-03-20 14:29:58 +09:00
parent 69f08242ad
commit a57ae4a249
1 changed files with 8 additions and 8 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/project/LabelTypeIT.java
View File

@@ -288,25 +288,25 @@ public class LabelTypeIT extends AbstractDaemonTest {
String file = "a.txt";
String contents = "contents";
PushOneCommit push = pushFactory.create(db, admin.getIdent(),
PushOneCommit push = pushFactory.create(db, admin.getIdent(), testRepo,
PushOneCommit.SUBJECT, file, contents);
PushOneCommit.Result base = push.to(git, "refs/for/master");
PushOneCommit.Result base = push.to("refs/for/master");
merge(base);
push = pushFactory.create(db, admin.getIdent(),
push = pushFactory.create(db, admin.getIdent(), testRepo,
PushOneCommit.SUBJECT, file, contents + "M");
PushOneCommit.Result basePlusM = push.to(git, "refs/for/master");
PushOneCommit.Result basePlusM = push.to("refs/for/master");
merge(basePlusM);
push = pushFactory.create(db, admin.getIdent(),
push = pushFactory.create(db, admin.getIdent(), testRepo,
PushOneCommit.SUBJECT, file, contents);
PushOneCommit.Result basePlusMMinusM = push.to(git, "refs/for/master");
PushOneCommit.Result basePlusMMinusM = push.to("refs/for/master");
merge(basePlusMMinusM);
git.checkout().setName(base.getCommit().name()).call();
push = pushFactory.create(db, admin.getIdent(),
push = pushFactory.create(db, admin.getIdent(), testRepo,
PushOneCommit.SUBJECT, file, contents + "MM");
PushOneCommit.Result patchSet = push.to(git, "refs/for/master");
PushOneCommit.Result patchSet = push.to("refs/for/master");
revision(patchSet).review(ReviewInput.recommend());
return patchSet;
}