opendev/gerrit
Code Issues Proposed changes

Fix merge validator exception type is ignored

Browse Source 
The switch case in updateChangeStatus was supposed to handle the failed
cases but it was never reached by changes who failed to merge, since
only the submitted ones are returned by the validation function.

Now, updateChangeStatus is called on every change that doesn't make it
out of the validation. Also, the parameter name 'submitted' did not make
sense since the method handles changes who cannot be submitted, so it is
renamed to 'changes'.

Also, destBranch is optionally null in updateChangeStatus since it
doesn't apply to failed merges.

Tests are modified since the error output is more verbose than before.

Bug: Issue 3741
Change-Id: Id1de81b3136b94e210c957a58b5c801a1faa3244
This commit is contained in:
Alexandre Philbert
2016-01-22 15:40:55 -05:00
parent 2258fd0d40
commit dd41c53bd7
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
View File

@@ -296,7 +296,9 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge {
"a.txt", "1", "a-topic-here");
approve(change3b.getChangeId());
submitWithConflict(change3a.getChangeId(), "Merge Conflict");
submitWithConflict(change3a.getChangeId(), "Cannot merge " +
change3a.getCommit().name() +
"\nMissing dependency");
RevCommit tipbranch = getRemoteLog(project, "branch").get(0);
assertThat(tipbranch.getShortMessage()).isEqualTo(

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByRebaseIfNecessaryIT.java
View File

@@ -107,7 +107,9 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
testRepo.reset(initialHead);
PushOneCommit.Result change2 =
createChange("Change 2", "a.txt", "other content");
submitWithConflict(change2.getChangeId(), "Merge Conflict");
submitWithConflict(change2.getChangeId(), "Cannot rebase " +
change2.getCommit().name() +
": The change could not be rebased due to a conflict during merge.");
RevCommit head = getRemoteHead();
assertThat(head).isEqualTo(oldHead);
assertCurrentRevision(change2.getChangeId(), 1, change2.getCommitId());