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

Simplify process spawning in integration tests #3759

Merged
merged 13 commits into from
Dec 8, 2023
Merged

Simplify process spawning in integration tests #3759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
75d6b45
[feat] refactoring: use proper bracketing of services
MangoIV Nov 28, 2023
3e3b96a
[chore] some minor cleanups and more comments
MangoIV Nov 28, 2023
c0f93f5
[fix] class continuation in the right place
MangoIV Nov 29, 2023
98cef03
[wip] some print statements and more experimentations around interrupt
MangoIV Nov 29, 2023
9306c9c
Add bracketed service spawning
pcapriotti Nov 29, 2023
e67691b
Use codensity spawner
pcapriotti Nov 29, 2023
1f1e2f6
Pass service map to liveness check
pcapriotti Nov 30, 2023
b5cdc6c
Reimplement timeout using Async
pcapriotti Nov 30, 2023
34b228b
Use a static service map
pcapriotti Nov 30, 2023
98f655d
Use traverseConcurrentlyCodensity
pcapriotti Nov 30, 2023
215d788
Cleanup and fix warnings
pcapriotti Nov 30, 2023
d4d6587
Add CHANGELOG entry
pcapriotti Dec 1, 2023
faf0d77
Minor cleanups
pcapriotti Dec 4, 2023
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
1 change: 1 addition & 0 deletions changelog.d/5-internal/integration-proper-cleanup
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Simplify process spawning of dynamic backends in integration tests
15 changes: 9 additions & 6 deletions integration/test/Testlib/Env.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,26 @@ mkGlobalEnv cfgFile = do
& Cassandra.setContacts intConfig.cassandra.host []
& Cassandra.setPortNumber (fromIntegral intConfig.cassandra.port)
cassClient <- Cassandra.init cassSettings
let resources = backendResources (Map.elems intConfig.dynamicBackends)
resourcePool <-
liftIO $
createBackendResourcePool
(Map.elems intConfig.dynamicBackends)
resources
intConfig.rabbitmq
cassClient
let sm =
Map.fromList $
[ (intConfig.backendOne.originDomain, intConfig.backendOne.beServiceMap),
(intConfig.backendTwo.originDomain, intConfig.backendTwo.beServiceMap)
]
<> [(berDomain resource, resourceServiceMap resource) | resource <- resources]
tempDir <- Codensity $ withSystemTempDirectory "test"
timeOutSeconds <-
liftIO $
fromMaybe 10 . (readMaybe @Int =<<) <$> (lookupEnv "TEST_TIMEOUT_SECONDS")
pure
GlobalEnv
{ gServiceMap =
Map.fromList
[ (intConfig.backendOne.originDomain, intConfig.backendOne.beServiceMap),
(intConfig.backendTwo.originDomain, intConfig.backendTwo.beServiceMap)
],
{ gServiceMap = sm,
gDomain1 = intConfig.backendOne.originDomain,
gDomain2 = intConfig.backendTwo.originDomain,
gDynamicDomains = (.domain) <$> Map.elems intConfig.dynamicBackends,
Expand Down
Loading
Loading