core: stabilize tests (#2500)

This commit is contained in:
spaced4ndy
2023-05-24 16:14:41 +04:00
committed by GitHub
parent 24c09f2041
commit fd2c7c888c
16 changed files with 787 additions and 714 deletions
+12 -11
View File
@@ -895,8 +895,8 @@ testMaintenanceModeWithFiles tmp = do
testDatabaseEncryption :: HasCallStack => FilePath -> IO ()
testDatabaseEncryption tmp = do
withNewTestChat tmp "bob" bobProfile $ \bob -> do
withNewTestChatOpts tmp testOpts {maintenance = True} "alice" aliceProfile $ \alice -> do
withNewTestChat tmp "bob" bobProfile $ \b -> withTestOutput b $ \bob -> do
withNewTestChatOpts tmp testOpts {maintenance = True} "alice" aliceProfile $ \a -> withTestOutput a $ \alice -> do
alice ##> "/_start"
alice <## "chat started"
connectUsers alice bob
@@ -914,7 +914,7 @@ testDatabaseEncryption tmp = do
alice <## "ok"
alice ##> "/_start"
alice <## "error: chat store changed, please restart chat"
withTestChatOpts tmp (getTestOpts True "mykey") "alice" $ \alice -> do
withTestChatOpts tmp (getTestOpts True "mykey") "alice" $ \a -> withTestOutput a $ \alice -> do
alice ##> "/_start"
alice <## "chat started"
testChatWorking alice bob
@@ -926,7 +926,7 @@ testDatabaseEncryption tmp = do
alice <## "ok"
alice ##> "/_db encryption {\"currentKey\":\"nextkey\",\"newKey\":\"anotherkey\"}"
alice <## "ok"
withTestChatOpts tmp (getTestOpts True "anotherkey") "alice" $ \alice -> do
withTestChatOpts tmp (getTestOpts True "anotherkey") "alice" $ \a -> withTestOutput a $ \alice -> do
alice ##> "/_start"
alice <## "chat started"
testChatWorking alice bob
@@ -934,7 +934,8 @@ testDatabaseEncryption tmp = do
alice <## "chat stopped"
alice ##> "/db decrypt anotherkey"
alice <## "ok"
withTestChat tmp "alice" $ \alice -> testChatWorking alice bob
withTestChat tmp "alice" $ \a -> withTestOutput a $ \alice -> do
testChatWorking alice bob
testMuteContact :: HasCallStack => FilePath -> IO ()
testMuteContact =
@@ -1315,13 +1316,13 @@ testUsersRestartCIExpiration tmp = do
withNewTestChat tmp "bob" bobProfile $ \bob -> do
withNewTestChatCfg tmp cfg "alice" aliceProfile $ \alice -> do
-- set ttl for first user
alice #$> ("/_ttl 1 1", id, "ok")
alice #$> ("/_ttl 1 2", id, "ok")
connectUsers alice bob
-- create second user and set ttl
alice ##> "/create user alisa"
showActiveUser alice "alisa"
alice #$> ("/_ttl 2 3", id, "ok")
alice #$> ("/_ttl 2 5", id, "ok")
connectUsers alice bob
-- first user messages
@@ -1353,7 +1354,7 @@ testUsersRestartCIExpiration tmp = do
-- first user messages
alice ##> "/user alice"
showActiveUser alice "alice (Alice)"
alice #$> ("/ttl", id, "old messages are set to be deleted after: 1 second(s)")
alice #$> ("/ttl", id, "old messages are set to be deleted after: 2 second(s)")
alice #> "@bob alice 3"
bob <# "alice> alice 3"
@@ -1365,7 +1366,7 @@ testUsersRestartCIExpiration tmp = do
-- second user messages
alice ##> "/user alisa"
showActiveUser alice "alisa"
alice #$> ("/ttl", id, "old messages are set to be deleted after: 3 second(s)")
alice #$> ("/ttl", id, "old messages are set to be deleted after: 5 second(s)")
alice #> "@bob alisa 3"
bob <# "alisa> alisa 3"
@@ -1374,7 +1375,7 @@ testUsersRestartCIExpiration tmp = do
alice #$> ("/_get chat @4 count=100", chat, chatFeatures <> [(1, "alisa 1"), (0, "alisa 2"), (1, "alisa 3"), (0, "alisa 4")])
threadDelay 2000000
threadDelay 3000000
-- messages both before and after restart are deleted
-- first user messages
@@ -1387,7 +1388,7 @@ testUsersRestartCIExpiration tmp = do
showActiveUser alice "alisa"
alice #$> ("/_get chat @4 count=100", chat, chatFeatures <> [(1, "alisa 1"), (0, "alisa 2"), (1, "alisa 3"), (0, "alisa 4")])
threadDelay 2000000
threadDelay 3000000
alice #$> ("/_get chat @4 count=100", chat, [])
where