diff options
Diffstat (limited to 'gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java')
-rw-r--r-- | gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java index 0ac263f299..bb4abe1a61 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java @@ -19,7 +19,6 @@ import static org.junit.Assert.fail; import com.google.gerrit.acceptance.GitUtil; import com.google.gerrit.acceptance.PushOneCommit; -import com.google.gerrit.acceptance.TestProjectInput; import com.google.gerrit.extensions.api.changes.ChangeApi; import com.google.gerrit.extensions.api.changes.CherryPickInput; import com.google.gerrit.extensions.api.changes.ReviewInput; @@ -510,30 +509,6 @@ public class SubmitByMergeIfNecessaryIT extends AbstractSubmitByMerge { } @Test - @TestProjectInput(createEmptyCommit = false) - public void mergeWithMissingChange() throws Exception { - // create a draft change - PushOneCommit.Result draftResult = createDraftChange(); - - // create a new change based on the draft change - PushOneCommit.Result changeResult = createChange(); - - // delete the draft change - gApi.changes().id(draftResult.getChangeId()).delete(); - - // approve and submit the change - submitWithConflict( - changeResult.getChangeId(), - "Failed to submit 1 change due to the following problems:\n" - + "Change " - + changeResult.getChange().getId() - + ": depends on change that was not submitted"); - - assertRefUpdatedEvents(); - assertChangeMergedEvents(); - } - - @Test public void testPreviewSubmitTgz() throws Exception { Project.NameKey p1 = createProject("project-name"); |