diff --git a/yesod-core/ChangeLog.md b/yesod-core/ChangeLog.md index fae259fa..94890204 100644 --- a/yesod-core/ChangeLog.md +++ b/yesod-core/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-core +## 1.6.22.1 + ++ Remove sometimes failing superfluous test. [#1756](https://github.com/yesodweb/yesod/pull/1756) + ## 1.6.22.0 * Add missing list to documentation for ``Yesod.Core.Dispatch.warp``. [#1745](https://github.com/yesodweb/yesod/pull/1745) diff --git a/yesod-core/test/YesodCoreTest/ErrorHandling.hs b/yesod-core/test/YesodCoreTest/ErrorHandling.hs index bc02570f..0995cd62 100644 --- a/yesod-core/test/YesodCoreTest/ErrorHandling.hs +++ b/yesod-core/test/YesodCoreTest/ErrorHandling.hs @@ -51,7 +51,6 @@ mkYesod "App" [parseRoutes| /args-not-valid ArgsNotValidR POST /only-plain-text OnlyPlainTextR GET -/allocation-limit AlocationLimitR GET /thread-killed ThreadKilledR GET /async-session AsyncSessionR GET |] @@ -120,17 +119,6 @@ goodBuilderContent = Data.Monoid.mconcat $ replicate 100 $ "This is a test\n" getGoodBuilderR :: Handler TypedContent getGoodBuilderR = return $ TypedContent "text/plain" $ toContent goodBuilderContent -getAlocationLimitR :: Handler Html -getAlocationLimitR = - (do - liftIO $ do - Mem.setAllocationCounter 1 -- very low limit - Mem.enableAllocationLimit - defaultLayout $ [whamlet| -
this will trigger https://hackage.haskell.org/package/base-4.16.0.0/docs/Control-Exception.html#t:AllocationLimitExceeded
- which we need to catch
- |]) `finally` liftIO Mem.disableAllocationLimit
-
-- this handler kills it's own thread
getThreadKilledR :: Handler Html
getThreadKilledR = do
@@ -191,7 +179,6 @@ errorHandlingTest = describe "Test.ErrorHandling" $ do
it "accept image, non-existent path -> 404" caseImageNotFound
it "accept video, bad method -> 405" caseVideoBadMethod
it "thread killed = 500" caseThreadKilled500
- it "allocation limit = 500" caseAllocationLimit500
it "async session exception = 500" asyncSessionKilled500
runner :: Session a -> IO a
@@ -331,12 +318,6 @@ caseVideoBadMethod = runner $ do
}
assertStatus 405 res
-caseAllocationLimit500 :: IO ()
-caseAllocationLimit500 = runner $ do
- res <- request defaultRequest { pathInfo = ["allocation-limit"] }
- assertStatus 500 res
- assertBodyContains "Internal Server Error" res
-
caseThreadKilled500 :: IO ()
caseThreadKilled500 = runner $ do
res <- request defaultRequest { pathInfo = ["thread-killed"] }
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 9bf163f1..d900011c 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -1,5 +1,5 @@
name: yesod-core
-version: 1.6.22.0
+version: 1.6.22.1
license: MIT
license-file: LICENSE
author: Michael Snoyman