This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-server".
The branch, 0.2-stable has been updated
via 1e2494210e8e9ab4529d3d13ae140e193a1f255c (commit)
via f08341dbffc5813dbec4ef72f9165ebcae4dee54 (commit)
from f1f6ae97ee06f05e859455003815e22484dc938e (commit)
Summary of changes:
snap-server.cabal | 2 +-
test/suite/Snap/Internal/Http/Server/Tests.hs | 42 ++++++++++++++++---------
2 files changed, 28 insertions(+), 16 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1e2494210e8e9ab4529d3d13ae140e193a1f255c
Merge: f1f6ae9 f08341d
Author: Gregory Collins <[email protected]>
Date: Sun Oct 10 21:33:24 2010 +0200
Merge branch '0.2.13-fixes' into 0.2-stable
Conflicts:
snap-server.cabal
commit f08341dbffc5813dbec4ef72f9165ebcae4dee54
Author: Gregory Collins <[email protected]>
Date: Sun Oct 10 21:32:19 2010 +0200
Fix testsuite (runHTTP semantics have changed)
diff --git a/snap-server.cabal b/snap-server.cabal
index afaa34a..c7c5fe5 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -1,5 +1,5 @@
name: snap-server
-version: 0.2.13.1
+version: 0.2.13.2
synopsis: A fast, iteratee-based, epoll-enabled web server for the Snap
Framework
description:
This is the first developer prerelease of the Snap framework. Snap is a
diff --git a/test/suite/Snap/Internal/Http/Server/Tests.hs
b/test/suite/Snap/Internal/Http/Server/Tests.hs
index 086cad2..3e885b5 100644
--- a/test/suite/Snap/Internal/Http/Server/Tests.hs
+++ b/test/suite/Snap/Internal/Http/Server/Tests.hs
@@ -7,7 +7,11 @@ module Snap.Internal.Http.Server.Tests
( tests ) where
import Control.Concurrent
-import Control.Exception (try, throwIO, bracket, SomeException)
+import Control.Exception ( try
+ , throwIO
+ , bracket
+ , finally
+ , SomeException )
import Control.Monad
import "monads-fd" Control.Monad.Trans
import qualified Data.ByteString.Char8 as S
@@ -578,8 +582,12 @@ testChunkOn1_0 = testCase "server/transfer-encoding
chunked" $ do
ref <- newIORef ""
let (iter,onSendFile) = mkIter ref
- runHTTP "localhost" "127.0.0.1" 80 "127.0.0.1" 58384
- Nothing Nothing enumBody iter onSendFile (return ()) f
+ done <- newEmptyMVar
+ forkIO (runHTTP "localhost" "127.0.0.1" 80 "127.0.0.1" 58384
+ Nothing Nothing enumBody iter onSendFile (return ()) f
+ `finally` putMVar done ())
+
+ takeMVar done
-- this is a pretty lame way of checking whether the output was chunked,
-- but "whatever"
@@ -618,18 +626,22 @@ testHttp2 = testCase "server/connection: close" $ do
let (iter,onSendFile) = mkIter ref
- runHTTP "localhost"
- "127.0.0.1"
- 80
- "127.0.0.1"
- 58384
- Nothing
- Nothing
- enumBody
- iter
- onSendFile
- (return ())
- echoServer2
+ done <- newEmptyMVar
+
+ forkIO (runHTTP "localhost"
+ "127.0.0.1"
+ 80
+ "127.0.0.1"
+ 58384
+ Nothing
+ Nothing
+ enumBody
+ iter
+ onSendFile
+ (return ())
+ echoServer2 `finally` putMVar done ())
+
+ takeMVar done
s <- readIORef ref
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
