testsuite: Run all tests sequentially

Otherwise we too often encounter tests which try to open the same socket
simultaneously.

Author: bgamari

changelog

@@ -1,5 +1,6 @@
 0.2.5
   * Deprecate `NN_LINGER` option
+  * Improve testsuite reliability
 
 0.2.4
   * Bumped upper bound on binary

nanomsg-haskell.cabal

@@ -51,39 +51,17 @@ library
 test-suite tests
   type:              exitcode-stdio-1.0
   hs-source-dirs:    tests
-  main-is:           PropDriver.hs
+  main-is:           Main.hs
   other-modules:     BinaryProperties Properties
   ghc-options:       -O2 -Wall -fwarn-tabs -threaded "-with-rtsopts=-N" -rtsopts
   default-language:  Haskell2010
-  build-tool-depends:
-    tasty-discover:tasty-discover
   build-depends:
     base >= 4.5 && < 5,
     bytestring >= 0.9.0 && < 0.13,
     nanomsg-haskell,
     QuickCheck,
     tasty,
-    tasty-quickcheck,
-    tasty-discover
-
-test-suite tests-binary
-  type:              exitcode-stdio-1.0
-  hs-source-dirs:    tests
-  main-is:           BinaryDriver.hs
-  other-modules:     Properties BinaryProperties
-  ghc-options:       -O2 -Wall -fwarn-tabs -threaded "-with-rtsopts=-N" -rtsopts
-  default-language:  Haskell2010
-  build-tool-depends:
-    tasty-discover:tasty-discover
-  build-depends:
-    base >= 4.5 && < 5,
-    bytestring >= 0.9.0 && < 0.13,
-    nanomsg-haskell,
-    binary,
-    QuickCheck,
-    tasty,
-    tasty-quickcheck,
-    tasty-discover
+    tasty-quickcheck
 
 source-repository head
   type:              git

tests/BinaryDriver.hs

@@ -204,3 +204,13 @@ test_options = sequentialTestGroup "options" AllFinish
         close sock
         return $ value === v
 
+tests :: TestTree
+tests = sequentialTestGroup "BinaryProperties" AllFinish
+    [ testProperty "reverse" prop_reverse
+    , testProperty "PubSub" prop_PubSub
+    , testProperty "Pair" prop_Pair
+    , testProperty "Pipeline" prop_Pipeline
+    , testProperty "ReqRep" prop_ReqRep
+    , testProperty "Bus" prop_Bus
+    ]
+

tests/BinaryProperties.hs

@@ -0,0 +1,20 @@
+import qualified Test.Tasty as T
+import qualified Test.Tasty.Ingredients as T
+
+import qualified BinaryProperties
+import qualified Properties
+
+tests :: T.TestTree
+tests =
+    T.sequentialTestGroup "tests" T.AllFinish
+      [ Properties.tests
+      , BinaryProperties.tests
+      ]
+
+ingredients :: [T.Ingredient]
+ingredients = T.defaultIngredients
+
+main :: IO ()
+main = do
+    T.defaultMainWithIngredients ingredients tests
+

tests/Main.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Properties where
@@ -199,3 +198,13 @@ test_options = sequentialTestGroup "options" AllFinish
         close sock
         return $ value === v
 
+tests :: TestTree
+tests = sequentialTestGroup "Properties" AllFinish
+    [ testProperty "reverse" prop_reverse
+    , testProperty "PubSub" prop_PubSub
+    , testProperty "Pair" prop_Pair
+    , testProperty "Pipeline" prop_Pipeline
+    , testProperty "ReqRep" prop_ReqRep
+    , testProperty "Bus" prop_Bus
+    ]
+