Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

test(control-api): wait for PostgreSQL client closure before teardown

Alfredo Lopez743260961954
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index 7bc4125fe..f0f315c32 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.687",
+ "version": "0.1.688",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.687",
+ "version": "0.1.688",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/grok-provider-attempt-contract": "file:../packages/grok-provider-attempt-contract",
diff --git a/control-api/package.json b/control-api/package.json
index d2e83ca3a..bf10b20e9 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.687",
+ "version": "0.1.688",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/test/oauth.reactiveRefreshLock.realPostgres.integration.test.ts b/control-api/test/oauth.reactiveRefreshLock.realPostgres.integration.test.ts
index d29448b5b..51183fe6f 100644
--- a/control-api/test/oauth.reactiveRefreshLock.realPostgres.integration.test.ts
+++ b/control-api/test/oauth.reactiveRefreshLock.realPostgres.integration.test.ts
@@ -63,26 +63,32 @@ describeRealPostgres('oauth reactive refresh — row-lock serialization (real Po
let adminPool: Pool
let dbPool: Pool
let db: DbClient
+ const clientClosures: Promise<void>[] = []
beforeAll(async () => {
if (!adminUrl) throw new Error('CONTROL_API_REAL_PG_ADMIN_URL is required')
adminPool = new Pool({ connectionString: adminUrl })
await adminPool.query(`CREATE DATABASE "${database.replace(/"/g, '""')}"`)
dbPool = new Pool({ connectionString: databaseUrl(adminUrl, database) })
+ // pg-pool can resolve end() before its clients' asynchronous socket closes.
+ // Register physical closure before initDb creates the first connection.
+ dbPool.on('connect', client => {
+ clientClosures.push(new Promise<void>(resolve => client.once('end', resolve)))
+ })
await initDb({ connect: () => dbPool.connect() })
db = { query: (text, values) => dbPool.query(text, values) }
})
afterAll(async () => {
- await dbPool?.end()
- if (adminPool) {
- await adminPool.query(
- `SELECT pg_terminate_backend(pid) FROM pg_stat_activity
- WHERE datname = $1 AND pid <> pg_backend_pid()`,
- [database]
- )
- await adminPool.query(`DROP DATABASE IF EXISTS "${database.replace(/"/g, '""')}"`)
- await adminPool.end()
+ try {
+ await dbPool?.end()
+ await Promise.all(clientClosures)
+ if (adminPool) {
+ // A remaining connection must fail DROP rather than be force-terminated.
+ await adminPool.query(`DROP DATABASE IF EXISTS "${database.replace(/"/g, '""')}"`)
+ }
+ } finally {
+ await adminPool?.end()
}
})