git.iko.soy/docker-hs
on master help sign in
Adds RUN_INTEGRATION_TESTS flag
30d6f71Deni Bertovic
.travis.yml+3−3
compare with master
unifiedsplit
@@ -22,9 +22,9 @@ services:
22 - docker
22 - docker
23
23
24env:
24env:
25− - GHCVER=7.10 STACK_ARGS=""
25+ - RUN_INTEGRATION_TESTS=1 GHCVER=7.10 STACK_ARGS=""
26− - GHCVER=8.0 STACK_ARGS=""
26+ - RUN_INTEGRATION_TESTS=1 GHCVER=8.0 STACK_ARGS=""
27− - GHCVER=8.0.2 STACK_ARGS=""
27+ - RUN_INTEGRATION_TESTS=1 GHCVER=8.0.2 STACK_ARGS=""
28
28
29addons:
29addons:
30 apt:
30 apt:
tests/tests.hs+8−2
@@ -28,6 +28,7 @@ import Network.Connection (TLSSettings (..))
28import Network.HTTP.Client (newManager)
28import Network.HTTP.Client (newManager)
29import Network.HTTP.Client.TLS
29import Network.HTTP.Client.TLS
30import Network.HTTP.Types.Status
30import Network.HTTP.Types.Status
31+import System.Environment (lookupEnv)
31import System.Process (system)
32import System.Process (system)
32
33
33import Docker.Client
34import Docker.Client
@@ -186,5 +187,10 @@ fromRight (Right r) = return r
186
187
187main :: IO ()
188main :: IO ()
188main = do
189main = do
190+ stackage <- lookupEnv "RUN_INTEGRATION_TESTS"
191+ case stackage of
192+ Nothing -> defaultMain $ testGroup "Tests" [jsonTests]
193+ Just _ -> do
189− setup
194+ setup
190− defaultMain $ testGroup "Tests" [jsonTests, integrationTests]
195+ defaultMain $ testGroup "Tests" [jsonTests, integrationTests]
196+