opendev/gerrit
Code Issues Proposed changes

Do not use deprecated waitForMerge option

Browse Source 
Submit is always waiting for the merge to complete, no need to use this
deprecated option.

Change-Id: Ie9411a86e5ff83f65ec017438ff3d74e0e836124
This commit is contained in:
Hugo Arès
2015-07-03 09:04:23 -04:00
parent d7f38a5ee3
commit b10d69ee80
4 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java
View File

@@ -123,7 +123,6 @@ public class RevisionIT extends AbstractDaemonTest {
.review(ReviewInput.approve()); .review(ReviewInput.approve());
SubmitInput in = new SubmitInput(); SubmitInput in = new SubmitInput();
in.onBehalfOf = admin2.email; in.onBehalfOf = admin2.email;
in.waitForMerge = true;
gApi.changes() gApi.changes()
.id(project.get() + "~master~" + r.getChangeId()) .id(project.get() + "~master~" + r.getChangeId())
.current() .current()

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

@@ -221,7 +221,6 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
private void submit(String changeId, int expectedStatus) throws Exception { private void submit(String changeId, int expectedStatus) throws Exception {
approve(changeId); approve(changeId);
SubmitInput subm = new SubmitInput(); SubmitInput subm = new SubmitInput();
subm.waitForMerge = false;
RestResponse r = RestResponse r =
adminSession.post("/changes/" + changeId + "/submit", subm); adminSession.post("/changes/" + changeId + "/submit", subm);
assertThat(r.getStatusCode()).isEqualTo(expectedStatus); assertThat(r.getStatusCode()).isEqualTo(expectedStatus);

1
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java
View File

@@ -29,7 +29,6 @@ public interface RevisionApi {
void delete() throws RestApiException; void delete() throws RestApiException;
void review(ReviewInput in) throws RestApiException; void review(ReviewInput in) throws RestApiException;
/** {@code submit} with {@link SubmitInput#waitForMerge} set to true. */
void submit() throws RestApiException; void submit() throws RestApiException;
void submit(SubmitInput in) throws RestApiException; void submit(SubmitInput in) throws RestApiException;
void publish() throws RestApiException; void publish() throws RestApiException;

1
gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java
View File

@@ -152,7 +152,6 @@ class RevisionApiImpl implements RevisionApi {
@Override @Override
public void submit() throws RestApiException { public void submit() throws RestApiException {
SubmitInput in = new SubmitInput(); SubmitInput in = new SubmitInput();
in.waitForMerge = true;
submit(in); submit(in);
} }