opendev/gerrit
Code Issues Proposed changes

Submit acceptance tests: disable waitForMerge

Browse Source 
waitForMerge is deprecated and the documentation claims it's always
waiting for the Merge to be performed. Test this by disabling
waitForMerge.

Change-Id: Iccad04d3df49ae3d0bc5964c1b45d1849fbac4ce
This commit is contained in:
Stefan Beller
2015-06-18 16:58:44 -07:00
parent 7c13ccf2c7
commit 27a5a068b4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,7 @@ 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 = true; 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);