Skip to content

Change the test port to 12001 so that it doesn't clash with running reserve instances. #9

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

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

Change the test port to 12001 so that it doesn't clash with running reserve instances. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b4854f
remove comment
soenkehahn Apr 6, 2016
befb3ab
change test port to 12001
soenkehahn Apr 9, 2016
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
1 change: 0 additions & 1 deletion src/Reserve.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import qualified Interpreter
data Session = Session Socket Interpreter

openSession :: Options -> IO Session
-- openSession opts = Session <$> listenOn (optionsReservePort opts) <*> Interpreter.new (optionsMainIs opts)
openSession opts = Session <$> listenOn (PortNumber $ optionsReservePort opts) <*> Interpreter.new (optionsMainIs opts)

closeSession :: Session -> IO ()
Expand Down
18 changes: 11 additions & 7 deletions test/ReserveSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,26 +43,30 @@ withServer action = inTempDirectory $ do
bracket (runReserve mvar) killThread (const $ yield >> action)
takeMVar mvar
where
runReserve mvar = forkIO $ run defaultOptions {optionsMainIs = "app.hs"} `finally` putMVar mvar ()
runReserve mvar = forkIO $ run options `finally` putMVar mvar ()
options = defaultOptions {
optionsMainIs = "app.hs",
optionsReservePort = 12001
}

spec :: Spec
spec = around_ withServer $ do
describe "run" $ do
it "runs app" $ do
simpleHttp "http://localhost:12000/" `shouldReturn` "hello"
simpleHttp "http://localhost:12001/" `shouldReturn` "hello"

it "reloads app" $ do
simpleHttp "http://localhost:12000/" `shouldReturn` "hello"
simpleHttp "http://localhost:12001/" `shouldReturn` "hello"
appWithResponse (literal "foo")
simpleHttp "http://localhost:12000/" `shouldReturn` "foo"
simpleHttp "http://localhost:12001/" `shouldReturn` "foo"

it "can deal with large response bodies" $ do
appWithResponse [i|(B.take 100000 $ B.cycle #{literal "foo bar baz\n"})|]
simpleHttp "http://localhost:12000/large-response" `shouldReturn` (L.take 100000 $ L.cycle "foo bar baz\n")
simpleHttp "http://localhost:12001/large-response" `shouldReturn` (L.take 100000 $ L.cycle "foo bar baz\n")

context "when client closes connection early" $ do
it "ignores that client" $ do
h <- connectTo "localhost" (PortNumber 12000)
h <- connectTo "localhost" (PortNumber 12001)
hPutStr h "GET / HTTP/1.1\r\n\r\n"
hClose h
simpleHttp "http://localhost:12000/" `shouldReturn` "hello"
simpleHttp "http://localhost:12001/" `shouldReturn` "hello"