Skip to content

Commit

Permalink
[WPB-11472] Revert "Work around legacy integration test resource leak. (
Browse files Browse the repository at this point in the history
wireapp#4244)" (wireapp#4287)

* Revert "Work around legacy integration test resource leak. (wireapp#4244)"

This reverts commit a72c70a.

(it turns out this only helps with resource consumption because
after running the first bach of tests, defaultMainWithIngredients
exits...  m|

* hi ci
  • Loading branch information
fisx authored Oct 14, 2024
1 parent bd5694c commit 54cdc26
Showing 1 changed file with 8 additions and 20 deletions.
28 changes: 8 additions & 20 deletions services/brig/test/integration/Run.hs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ import Options.Applicative hiding (action)
import SMTP qualified
import System.Environment (withArgs)
import System.Logger qualified as Logger
import System.Mem (performGC)
import Test.Tasty
import Test.Tasty.Ingredients
import Test.Tasty.Runners
Expand Down Expand Up @@ -151,14 +150,16 @@ runTests iConf brigOpts otherArgs = do
let smtp = SMTP.tests mg lg
oauthAPI = API.OAuth.tests mg db b n brigOpts

-- run the tests in two parts, with a gc in between. i did this on a hunch, and for some
-- reason this reduces the hunger for open file handles at run time significantly, and makes
-- the suite pass with my ulimit settings. (fisx)

withArgs otherArgs . defaultMainWithIngredients (listingTests : (composeReporters antXMLRunner consoleTestReporter) : defaultIngredients)
$ testGroup
"Brig API Integration, part 1"
$ [ systemSettingsApi,
"Brig API Integration"
$ [ userApi,
providerApi,
searchApis,
teamApis,
turnApi,
metricsApi,
systemSettingsApi,
settingsApi,
createIndex,
userPendingActivation,
Expand All @@ -169,19 +170,6 @@ runTests iConf brigOpts otherArgs = do
oauthAPI,
federationEnd2End
]

performGC

withArgs otherArgs . defaultMainWithIngredients (listingTests : (composeReporters antXMLRunner consoleTestReporter) : defaultIngredients)
$ testGroup
"Brig API Integration, part 2"
$ [ userApi,
providerApi,
searchApis,
teamApis,
turnApi,
metricsApi
]
where
mkRequest (Endpoint h p) = Bilge.host (encodeUtf8 h) . Bilge.port p

Expand Down

0 comments on commit 54cdc26

Please sign in to comment.