simple-sendfile 0.2.10 → 0.2.11

raw patch · 3 files changed

+7/−39 lines, 3 filesdep ~conduit

Dependency ranges changed: conduit

Files

• simple-sendfile.cabal +4/−3
• test/SendfileSpec.hs +2/−36
• test/Spec.hs +1/−0

@@ -1,5 +1,5 @@ Name:                   simple-sendfile-Version:                0.2.10+Version:                0.2.11 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3@@ -39,15 +39,16 @@         Build-Depends:  unix       else         Other-Modules:  Network.Sendfile.Fallback-        Build-Depends:  conduit         >= 0.4.1 && < 0.6+        Build-Depends:  conduit         >= 0.4.1 && < 1.1                       , transformers    >= 0.2.2 && < 0.4  Test-Suite spec   Type:                 exitcode-stdio-1.0   Default-Language:     Haskell2010   Hs-Source-Dirs:       test-  Main-Is:              SendfileSpec.hs+  Main-Is:              Spec.hs   GHC-Options:          -Wall+  Other-Modules:        SendfileSpec   Build-Depends:        base                       , HUnit                       , bytestring

@@ -1,12 +1,11 @@ {-# LANGUAGE OverloadedStrings #-} -module Main where+module SendfileSpec where  import Control.Concurrent import Control.Exception import Control.Monad-import Data.ByteString (ByteString)-import qualified Data.ByteString.Char8 as BS+import Data.ByteString.Char8 as BS import Data.Conduit import Data.Conduit.Binary as CB import Data.Conduit.List as CL@@ -24,16 +23,10 @@  ---------------------------------------------------------------- -main :: IO ()-main = do-    setup0-    hspec spec- spec :: Spec spec = do     describe "sendfile" $ do         it "sends an entire file" $ do-            setup0             sendFile EntireFile `shouldReturn` ExitSuccess         it "sends a part of file" $ do             sendFile (PartOfFile 2000 1000000) `shouldReturn` ExitSuccess@@ -222,30 +215,3 @@                   => FilePath                   -> Sink ByteString m () sinkAppendFile fp = sinkIOHandle (openBinaryFile fp AppendMode)--------------------------------------------------------------------srcFile :: String-srcFile = "/usr/share/dict/words"--dstFile :: String-dstFile = "test/inputFile"--setup0 :: IO ()-setup0 = do-    dst <- doesFileExist dstFile-    unless dst $ do-        src <- doesFileExist srcFile-        if src then do-            size <- getFileSize srcFile-            if size >= 1000000 then-                copyFile srcFile dstFile-              else-                failure-          else-            failure-  where-    getFileSize file = bracket (openFile file ReadMode) hClose hFileSize-    failure = do-        hPutStrLn stderr "You must copy a large file (> 1000000 bytes) to \"test/inputFile\"."-        exitFailure

@@ -0,0 +1,1 @@+{-# OPTIONS_GHC -F -pgmF hspec-discover #-}