Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WPB-11472] Revert "Work around legacy integration test resource leak. (#4244)" #4287

Merged
merged 2 commits into from
Oct 14, 2024
Merged

[WPB-11472] Revert "Work around legacy integration test resource leak. (#4244)" #4287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d10487b
Revert "Work around legacy integration test resource leak. (#4244)"
fisx Oct 9, 2024
6ad1987
hi ci
fisx Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 8 additions & 20 deletions services/brig/test/integration/Run.hs
View file
Open in desktop
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
Loading