opendev/gerrit
Code Issues Proposed changes

Fix test

Browse Source 
The test broke in I420161ca when manually verifying apparently missing a
package.

Change-Id: I79079c6e32a3004ff93ceb89d4f9fd61dacf7335
This commit is contained in:
Gal Paikin
2020-11-27 15:59:16 +01:00
parent 7c13c92e04
commit baaaab7f74
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
javatests/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java
View File

@@ -25,6 +25,7 @@ import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.acceptance.TestProjectInput;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.common.FooterConstants; import com.google.gerrit.common.FooterConstants;
import com.google.gerrit.entities.BranchNameKey;
import com.google.gerrit.entities.PatchSet; import com.google.gerrit.entities.PatchSet;
import com.google.gerrit.extensions.api.changes.SubmitInput; import com.google.gerrit.extensions.api.changes.SubmitInput;
import com.google.gerrit.extensions.client.ChangeStatus; import com.google.gerrit.extensions.client.ChangeStatus;
@@ -32,6 +33,7 @@ import com.google.gerrit.extensions.client.InheritableBoolean;
import com.google.gerrit.extensions.client.ListChangesOption; import com.google.gerrit.extensions.client.ListChangesOption;
import com.google.gerrit.extensions.client.SubmitType; import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.server.git.ChangeMessageModifier;
import com.google.gerrit.server.submit.CommitMergeStatus; import com.google.gerrit.server.submit.CommitMergeStatus;
import com.google.inject.Inject; import com.google.inject.Inject;
import java.util.List; import java.util.List;
@@ -89,12 +91,18 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
@Test @Test
public void changeMessageOnSubmit() throws Throwable { public void changeMessageOnSubmit() throws Throwable {
PushOneCommit.Result change = createChange(); PushOneCommit.Result change = createChange();
try (Registration registration = ChangeMessageModifier link =
extensionRegistry new ChangeMessageModifier() {
.newRegistration() @Override
.add( public String onSubmit(
(newCommitMessage, original, mergeTip, destination) -> String newCommitMessage,
newCommitMessage + "Custom: " + destination.branch())) { RevCommit original,
RevCommit mergeTip,
BranchNameKey destination) {
return newCommitMessage + "Custom: " + destination.branch();
}
};
try (Registration registration = extensionRegistry.newRegistration().add(link)) {
submit(change.getChangeId()); submit(change.getChangeId());
} }
testRepo.git().fetch().setRemote("origin").call(); testRepo.git().fetch().setRemote("origin").call();