Merge branch 'master' into ep/test-coverage

cabal.project

@@ -3,6 +3,14 @@ packages: .
 -- packages: . ../hs-socks
 -- packages: . ../http2
 
+package *
+  coverage: True
+  library-coverage: True
+
+package attoparsec
+  coverage: False
+  library-coverage: False
+
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/aeson.git

package.yaml

@@ -144,6 +144,8 @@ tests:
       - silently == 1.2.*
       - main-tester == 0.2.*
       - timeit == 2.0.*
+    ghc-options:
+      - -fhpc
 
 ghc-options:
   # - -haddock

simplexmq.cabal

@@ -545,7 +545,7 @@ test-suite simplexmq-test
       Paths_simplexmq
   hs-source-dirs:
       tests
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns
+  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -fhpc
   build-depends:
       HUnit ==1.6.*
     , QuickCheck ==2.14.*

tests/AgentTests/FunctionalAPITests.hs

@@ -168,7 +168,7 @@ functionalAPITests t = do
     it "should suspend agent on timeout, even if pending messages not sent" $
       testSuspendingAgentTimeout t
   describe "Batching SMP commands" $ do
-    it "should subscribe to multiple (200) subscriptions with batching" $
+    xit "should subscribe to multiple (200) subscriptions with batching" $
       testBatchedSubscriptions 200 10 t
     it "should subscribe to multiple (6) subscriptions with batching" $
       testBatchedSubscriptions 6 3 t