Merge branch 'master' into short-links

tests/ChatClient.hs

@@ -529,7 +529,7 @@ smpServerCfg =
       pendingENDInterval = 500000,
       ntfDeliveryInterval = 200000,
       smpServerVRange = supportedServerSMPRelayVRange,
-      transportConfig = mkTransportServerConfig True $ Just alpnSupportedSMPHandshakes,
+      transportConfig = mkTransportServerConfig True (Just alpnSupportedSMPHandshakes) True,
       smpHandshakeTimeout = 1000000,
       controlPort = Nothing,
       smpAgentCfg = defaultSMPClientAgentConfig,
@@ -582,7 +582,7 @@ xftpServerConfig =
       serverStatsLogFile = "tests/tmp/xftp-server-stats.daily.log",
       serverStatsBackupFile = Nothing,
       controlPort = Nothing,
-      transportConfig = mkTransportServerConfig True $ Just alpnSupportedXFTPhandshakes,
+      transportConfig = mkTransportServerConfig True (Just alpnSupportedXFTPhandshakes) False,
       responseDelay = 0
     }
 

tests/ChatTests/Groups.hs

@@ -84,7 +84,10 @@ chatGroupTests = do
   describe "batch send messages" $ do
     it "send multiple messages api" testSendMulti
     it "send multiple timed messages" testSendMultiTimed
+#if !defined(dbPostgres)
+    -- TODO [postgres] this test hangs with PostgreSQL
     it "send multiple messages (many chat batches)" testSendMultiManyBatches
+#endif
     xit'' "shared message body is reused" testSharedMessageBody
     xit'' "shared batch body is reused" testSharedBatchBody
   describe "async group connections" $ do
@@ -1826,7 +1829,7 @@ testDeleteMemberWithMessages =
           do
             cath <## "alice updated group #team:"
             cath <## "updated group preferences:"
-            cath <## "Full deletion: on"            
+            cath <## "Full deletion: on"
         ]
       threadDelay 750000
       bob #> "#team hello"
@@ -6795,7 +6798,7 @@ testForwardQuoteMention =
             bob <## "      hello @alice @cath",
           do
             cath <# "#team alice!> -> forwarded"
-            cath <## "      hello @alice @cath"          
+            cath <## "      hello @alice @cath"
         ]
       -- forward mentions
       alice `send` "@bob <- #team hello"