From 27a5a068b48113c00970b2cabb93fedffff56e88 Mon Sep 17 00:00:00 2001
From: Stefan Beller <sbeller@google.com>
Date: Thu, 18 Jun 2015 16:58:44 -0700
Subject: [PATCH] Submit acceptance tests: disable waitForMerge

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
---
 .../google/gerrit/acceptance/rest/change/AbstractSubmit.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
index f3536f93d7..666be73d4b 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
@@ -221,7 +221,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
   private void submit(String changeId, int expectedStatus) throws Exception {
     approve(changeId);
     SubmitInput subm = new SubmitInput();
-    subm.waitForMerge = true;
+    subm.waitForMerge = false;
     RestResponse r =
         adminSession.post("/changes/" + changeId + "/submit", subm);
     assertThat(r.getStatusCode()).isEqualTo(expectedStatus);