From 154caa3730060d88acaa21be5cd4a5716db44a86 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sun, 24 Jun 2018 16:34:16 +0300 Subject: [PATCH] git tests: fix rebase tests after 05131fe: PCE is not thrown anymore --- .../tests/git4idea/rebase/GitSingleRepoRebaseTest.kt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt b/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt index d55aa40ab86c..71a606a5f42a 100644 --- a/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt +++ b/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt @@ -17,7 +17,6 @@ package git4idea.rebase import com.intellij.dvcs.DvcsUtil import com.intellij.openapi.progress.EmptyProgressIndicator -import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.openapi.ui.DialogWrapper import com.intellij.openapi.ui.Messages import com.intellij.openapi.vcs.ui.CommitMessage @@ -31,7 +30,6 @@ import git4idea.test.* import org.junit.Assume import org.mockito.Mockito import org.mockito.Mockito.`when` -import kotlin.test.assertFailsWith class GitSingleRepoRebaseTest : GitRebaseBaseTest() { @@ -494,8 +492,6 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { repo.`diverge feature and master`() dialogManager.onDialog(GitRebaseEditor::class.java) { DialogWrapper.CANCEL_EXIT_CODE } - assertFailsWith(ProcessCanceledException::class) { rebaseInteractively() } - assertNoNotification() assertNoRebaseInProgress(repo) repo.`assert feature not rebased on master`() @@ -511,7 +507,6 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { } dialogManager.onMessage { Messages.CANCEL } - assertFailsWith(ProcessCanceledException::class) { rebaseInteractively() } assertNoNotification() assertNoRebaseInProgress(repo)