From 8541643db5651c5923cf99d67ef178e0d1449d54 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 4 Mar 2015 11:34:24 +0900 Subject: [PATCH 1/2] Fix broken SubmitByCherryPickIT Change Ide711cd5 added a test that verifies the review message added when a change is merged, but this fails for the cherry pick test because the message is different when the submit strategy is cherry pick. Update the test to check for the correct message when the submit strategy is cherry pick. Change-Id: If5966e5a5f21c68e52f87e49a842f55f7b578c8c --- .../gerrit/acceptance/rest/change/AbstractSubmit.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index d6d056ad73..ec78be5503 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -163,8 +163,13 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { ChangeInfo info = get(change.getChangeId(), ListChangesOption.MESSAGES); assertThat((Iterable)info.messages).isNotNull(); assertThat((Iterable)info.messages).hasSize(3); - assertThat(Iterables.getLast(info.messages).message).isEqualTo( - "Change has been successfully merged into the git repository by Administrator"); + if (getSubmitType() == SubmitType.CHERRY_PICK) { + assertThat(Iterables.getLast(info.messages).message).startsWith( + "Change has been successfully cherry-picked as "); + } else { + assertThat(Iterables.getLast(info.messages).message).isEqualTo( + "Change has been successfully merged into the git repository by Administrator"); + } } protected Git createProject() throws JSchException, IOException, From 325b6b52675c1c2d0e781344bae5581d4c69eb7e Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 4 Mar 2015 12:06:27 +0900 Subject: [PATCH 2/2] Submit: Set correct patch set on approval when submitting new patch set If a new patch set is pushed with the %submit option, the submitter was getting set on the previous patch set rather than the patch set that was newly created. Change-Id: I734020c714a95a2a52feb4ba0531d6bc244872ab --- .../src/main/java/com/google/gerrit/server/change/Submit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java index 220525aee1..5fae929a1a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java @@ -385,7 +385,7 @@ public class Submit implements RestModifyView, db.changes().beginTransaction(change.getId()); try { - BatchMetaDataUpdate batch = approve(change.currentPatchSetId(), + BatchMetaDataUpdate batch = approve(rsrc.getPatchSet().getId(), cd.changeControl(), update, caller, timestamp); // Write update commit after all normalized label commits. batch.write(update, new CommitBuilder());