Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix flaky test by a test env setup refactor #4273

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix flaky test by a test env setup refactor #4273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8769d5e
Refactor test env setup to use separate dirs for every test.
komikat Jun 2, 2024
1c9fc98
Merge branch 'master' into test-temp-dir
komikat Jun 3, 2024
acae9d9
ran stylish-haskell on Hls.hs
komikat Jun 3, 2024
62c556e
Merge branch 'master' into test-temp-dir
komikat Jun 3, 2024
5712610
create hls-test-root directory if missing
komikat Jun 3, 2024
f5607ed
Merge branch 'master' into test-temp-dir
komikat Jul 5, 2024
6594a28
temporary fix to breaking testcase after $TEMPDIR cleanup update
komikat Jul 5, 2024
0df9923
Merge branch 'master' into test-temp-dir
komikat Jul 10, 2024
507dac7
Merge branch 'master' into test-temp-dir
komikat Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ghcide/test/exe/FindDefinitionAndHoverTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ tests = let
holeL65 = Position 65 8 ; hleInfo2 = [ExpectHoverText ["_ :: a -> Maybe a"]]
cccL17 = Position 17 16 ; docLink = [ExpectHoverTextRegex "\\*Defined in 'GHC.Types'\\* \\*\\(ghc-prim-[0-9.]+\\)\\*\n\n"]
imported = Position 56 13 ; importedSig = getDocUri "Foo.hs" >>= \foo -> return [ExpectHoverText ["foo", "Foo", "Haddock"], mkL foo 5 0 5 3]
reexported = Position 55 14 ; reexportedSig = getDocUri "Bar.hs" >>= \bar -> return [ExpectHoverText ["Bar", "Bar", "Haddock"], if ghcVersion >= GHC94 && ghcVersion < GHC910 then mkL bar 3 5 3 8 else mkL bar 3 0 3 14]
reexported = Position 55 14 ; reexportedSig = getDocUri "Bar.hs" >>= \bar -> return [ExpectHoverText ["Bar", "Bar", "Haddock"], mkL bar 3 0 3 14] --
thLocL57 = Position 59 10 ; thLoc = [ExpectHoverText ["Identity"]]
cmtL68 = Position 67 0 ; lackOfdEq = [ExpectHoverExcludeText ["$dEq"]]
import310 = Position 3 10; pkgTxt = [ExpectHoverText ["Data.Text\n\ntext-"]]
Expand Down Expand Up @@ -211,6 +211,7 @@ tests = let
-- Flaky on Windows: https://github.com/haskell/haskell-language-server/issues/2997
testM no yes reexported reexportedSig "Imported symbol (reexported)"
else
-- Flaky after $TEMPDIR cleanup: https://github.com/haskell/haskell-language-server/issues/4348
testM yes yes reexported reexportedSig "Imported symbol (reexported)"
, test no yes thLocL57 thLoc "TH Splice Hover"
, test yes yes import310 pkgTxt "show package name and its version"
Expand Down
7 changes: 4 additions & 3 deletions hls-test-utils/src/Test/Hls.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ import System.Directory (canonicalizePath,
import System.Environment (lookupEnv, setEnv)
import System.FilePath
import System.IO.Extra (newTempDirWithin)
import System.IO.Temp (createTempDirectory)
import System.IO.Unsafe (unsafePerformIO)
import System.Process.Extra (createPipe)
import System.Time.Extra
Expand Down Expand Up @@ -560,9 +561,9 @@ setupTestEnvironment :: IO FilePath
setupTestEnvironment = do
tmpDirRoot <- getTemporaryDirectory
let testRoot = tmpDirRoot </> "hls-test-root"
testCacheDir = testRoot </> ".cache"
createDirectoryIfMissing True testCacheDir
setEnv "XDG_CACHE_HOME" testCacheDir
createDirectoryIfMissing True testRoot
tempCacheDir <- createTempDirectory testRoot ".cache"
setEnv "XDG_CACHE_HOME" tempCacheDir
pure testRoot

goldenWithHaskellDocFormatter
Expand Down
Loading