after test

Author: spaced4ndy

src/Simplex/Messaging/Agent/Store/Postgres.hs

@@ -12,7 +12,7 @@ module Simplex.Messaging.Agent.Store.Postgres
     createDBAndUserIfNotExists,
     dropSchema,
     dropAllSchemasExceptSystem,
-    dropDatabaseAndUserIfExists,
+    dropDatabaseAndUser,
   )
 where
 
@@ -152,8 +152,8 @@ dropAllSchemasExceptSystem connectInfo =
       forM_ schemaNames $ \(Only schema) ->
         PSQL.execute_ db (fromString $ "DROP SCHEMA " <> schema <> " CASCADE")
 
-dropDatabaseAndUserIfExists :: ConnectInfo -> IO ()
-dropDatabaseAndUserIfExists ConnectInfo {connectUser = user, connectDatabase = dbName} =
+dropDatabaseAndUser :: ConnectInfo -> IO ()
+dropDatabaseAndUser ConnectInfo {connectUser = user, connectDatabase = dbName} =
   bracket (PSQL.connect defaultConnectInfo {connectUser = "postgres", connectDatabase = "postgres"}) PSQL.close $
     \postgresDB -> do
       dbExists <- checkDBExists postgresDB dbName

tests/AgentTests.hs

@@ -25,15 +25,18 @@ import AgentTests.SQLiteTests (storeTests)
 
 agentTests :: ATransport -> Spec
 agentTests (ATransport t) = do
+  describe "Migration tests" migrationTests
   describe "Connection request" connectionRequestTests
   describe "Double ratchet tests" doubleRatchetTests
 #if defined(dbPostgres)
-  after_ (dropAllSchemasExceptSystem testDBConnectInfo) $
-    fdescribe "Functional API" $ functionalAPITests (ATransport t)
+  after_ (dropAllSchemasExceptSystem testDBConnectInfo) $ do
+    describe "Functional API" $ functionalAPITests (ATransport t)
+    describe "Chosen servers" serverChoiceTests
 #else
   describe "Functional API" $ functionalAPITests (ATransport t)
+  describe "Chosen servers" serverChoiceTests
+  -- notifications aren't tested with postgres, as we don't plan to use iOS client with it
   describe "Notification tests" $ notificationTests (ATransport t)
+  -- TODO [postgres] add work items tests for postgres (to test 'failed' fields)
   describe "SQLite store" storeTests
 #endif
-  describe "Chosen servers" serverChoiceTests
-  describe "Migration tests" migrationTests

tests/Test.hs

@@ -36,7 +36,7 @@ import XFTPCLI
 import XFTPServerTests (xftpServerTests)
 #if defined(dbPostgres)
 import Fixtures
-import Simplex.Messaging.Agent.Store.Postgres (createDBAndUserIfNotExists, dropDatabaseAndUserIfExists)
+import Simplex.Messaging.Agent.Store.Postgres (createDBAndUserIfNotExists, dropDatabaseAndUser)
 #else
 import AgentTests.SchemaDump (schemaDumpTest)
 #endif
@@ -52,8 +52,8 @@ main = do
     setEnv "APNS_KEY_FILE" "./tests/fixtures/AuthKey_H82WD9K9AQ.p8"
     hspec
 #if defined(dbPostgres)
-      . beforeAll_ (dropDatabaseAndUserIfExists testDBConnectInfo >> createDBAndUserIfNotExists testDBConnectInfo)
-      . afterAll_ (dropDatabaseAndUserIfExists testDBConnectInfo)
+      . beforeAll_ (dropDatabaseAndUser testDBConnectInfo >> createDBAndUserIfNotExists testDBConnectInfo)
+      . afterAll_ (dropDatabaseAndUser testDBConnectInfo)
 #endif
       . before_ (createDirectoryIfMissing False "tests/tmp")
       . after_ (eventuallyRemove "tests/tmp" 3)