From 369e4d6c7210fea1e3e8090fe72f4f80325941ec Mon Sep 17 00:00:00 2001 From: Sandy Maguire Date: Tue, 27 Oct 2020 13:04:24 -0700 Subject: [PATCH 1/2] Ignore flakey test --- test/functional/Tactic.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/functional/Tactic.hs b/test/functional/Tactic.hs index b722646336..ab7a9746e7 100644 --- a/test/functional/Tactic.hs +++ b/test/functional/Tactic.hs @@ -106,7 +106,8 @@ tests = testGroup , goldenTest "GoldenShowCompose.hs" 2 15 Auto "" , goldenTest "GoldenShowMapChar.hs" 2 8 Auto "" , goldenTest "GoldenSuperclass.hs" 7 8 Auto "" - , goldenTest "GoldenApplicativeThen.hs" 2 11 Auto "" + -- TODO(sandy): ignored, as it's slow and flakey in CI + -- , goldenTest "GoldenApplicativeThen.hs" 2 11 Auto "" ] From a2740efd0054e16ea10cf773cca9c2d62b0b6a30 Mon Sep 17 00:00:00 2001 From: Sandy Maguire Date: Tue, 27 Oct 2020 13:31:47 -0700 Subject: [PATCH 2/2] Ignore test --- test/functional/Tactic.hs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/functional/Tactic.hs b/test/functional/Tactic.hs index ab7a9746e7..eb31c58327 100644 --- a/test/functional/Tactic.hs +++ b/test/functional/Tactic.hs @@ -9,6 +9,7 @@ module Tactic where import Control.Applicative.Combinators ( skipManyTill ) +import Control.Monad (unless) import Control.Monad.IO.Class import Data.Foldable import Data.Maybe @@ -18,12 +19,12 @@ import qualified Data.Text.IO as T import Ide.Plugin.Tactic.TestTypes import Language.Haskell.LSP.Test import Language.Haskell.LSP.Types (ApplyWorkspaceEditRequest, Position(..) , Range(..) , CAResult(..) , CodeAction(..)) +import System.Directory (doesFileExist) +import System.FilePath import Test.Hls.Util import Test.Tasty +import Test.Tasty.ExpectedFailure (ignoreTestBecause) import Test.Tasty.HUnit -import System.FilePath -import System.Directory (doesFileExist) -import Control.Monad (unless) ------------------------------------------------------------------------------ @@ -106,8 +107,8 @@ tests = testGroup , goldenTest "GoldenShowCompose.hs" 2 15 Auto "" , goldenTest "GoldenShowMapChar.hs" 2 8 Auto "" , goldenTest "GoldenSuperclass.hs" 7 8 Auto "" - -- TODO(sandy): ignored, as it's slow and flakey in CI - -- , goldenTest "GoldenApplicativeThen.hs" 2 11 Auto "" + , ignoreTestBecause "It is unreliable in circleci builds" + $ goldenTest "GoldenApplicativeThen.hs" 2 11 Auto "" ]