opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'fix-broken-tests'

Browse Source 
* changes:
  Submit: Set correct patch set on approval when submitting new patch set
  Fix broken SubmitByCherryPickIT
This commit is contained in:
Edwin Kempin
2015-03-05 07:50:22 +00:00
committed by Gerrit Code Review
parent d6dc573586 325b6b5267
commit 0ba1b38e34
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
View File

@@ -163,9 +163,14 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
ChangeInfo info = get(change.getChangeId(), ListChangesOption.MESSAGES); ChangeInfo info = get(change.getChangeId(), ListChangesOption.MESSAGES);
assertThat((Iterable<?>)info.messages).isNotNull(); assertThat((Iterable<?>)info.messages).isNotNull();
assertThat((Iterable<?>)info.messages).hasSize(3); assertThat((Iterable<?>)info.messages).hasSize(3);
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( assertThat(Iterables.getLast(info.messages).message).isEqualTo(
"Change has been successfully merged into the git repository by Administrator"); "Change has been successfully merged into the git repository by Administrator");
} }
}
protected Git createProject() throws JSchException, IOException, protected Git createProject() throws JSchException, IOException,
GitAPIException { GitAPIException {

2
gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
View File

@@ -385,7 +385,7 @@ public class Submit implements RestModifyView<RevisionResource, SubmitInput>,
db.changes().beginTransaction(change.getId()); db.changes().beginTransaction(change.getId());
try { try {
BatchMetaDataUpdate batch = approve(change.currentPatchSetId(), BatchMetaDataUpdate batch = approve(rsrc.getPatchSet().getId(),
cd.changeControl(), update, caller, timestamp); cd.changeControl(), update, caller, timestamp);
// Write update commit after all normalized label commits. // Write update commit after all normalized label commits.
batch.write(update, new CommitBuilder()); batch.write(update, new CommitBuilder());