opendev/gerrit
Code Issues Proposed changes

SubmitByMergeIfNecessaryIT#submitMultipleChanges: remove reundant approve()

Browse Source 
The first change does not get submitted, so we don't need to approve it.

Change-Id: I933cccf1ac586473006869ee9d2c6202ccec878f
This commit is contained in:
David Pursehouse
2016-06-16 13:16:42 +09:00
parent 73e2aba83c
commit d66154ca48
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,8 +58,6 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge {
PushOneCommit.Result change3 = createChange("Change 3", "d", "d");
PushOneCommit.Result change4 = createChange("Change 4", "d", "d");
// First change stays untouched.
approve(change.getChangeId());
// Change 2 is a fast-forward, no need to merge.
submit(change2.getChangeId());
@@ -84,6 +82,7 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge {
assertPersonEquals(admin.getIdent(), headAfterSecondSubmit.getAuthorIdent());
assertPersonEquals(serverIdent.get(), headAfterSecondSubmit.getCommitterIdent());
// First change stays untouched.
assertNew(change.getChangeId());
// The two submit operations should have resulted in two ref-update events