admin/gbrain
1
0
Fork 0
mirror of https://github.com/garrytan/gbrain.git synced 2026-07-30 19:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(test): e2e tests clean up after themselves — no more orphan clients

Browse Source 
Problem: every test run left e2e-oauth-test, e2e-revoke-test, and
e2e-revoke-key-test rows in oauth_clients and access_tokens. The CLI-based
cleanup in afterAll was failing silently.

Fix:
- beforeAll: SQL DELETE of any e2e-* orphans from previous crashed runs
- afterAll: direct SQL cleanup of oauth_tokens, oauth_clients, access_tokens,
  mcp_request_log — all rows matching 'e2e-%' pattern
- No reliance on CLI commands for cleanup (they fail silently)

Verified: 52 tests pass, 0 test rows remain after run.
This commit is contained in:
Wintermute
2026-05-03 16:14:43 +00:00
parent fcaee7c926
commit 6c831d216d
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e/serve-http-oauth.test.ts
+22 -5
View File
@@ -34,6 +34,16 @@ describeE2E('serve-http OAuth 2.1 E2E (v0.26.1)', () => {
beforeAll(async () => {
const { execSync, spawn } = await import('child_process');
// Clean up orphans from any previous crashed test runs
try {
const postgres = (await import('postgres')).default;
const cleanSql = postgres(process.env.GBRAIN_DATABASE_URL || process.env.DATABASE_URL || '', { prepare: false });
await cleanSql`DELETE FROM oauth_tokens WHERE client_id IN (SELECT client_id FROM oauth_clients WHERE client_name LIKE 'e2e-%')`;
await cleanSql`DELETE FROM oauth_clients WHERE client_name LIKE 'e2e-%'`;
await cleanSql`DELETE FROM access_tokens WHERE name LIKE 'e2e-%'`;
await cleanSql.end();
} catch {}
// Register a test OAuth client via CLI
const regOutput = execSync(
'bun run src/cli.ts auth register-client e2e-oauth-test --grant-types client_credentials --scopes "read write"',
@@ -96,12 +106,19 @@ describeE2E('serve-http OAuth 2.1 E2E (v0.26.1)', () => {
await new Promise(r => setTimeout(r, 1000));
if (!serverProcess.killed) serverProcess.kill('SIGKILL');
}
// Revoke test client
// Nuclear cleanup via direct SQL — CLI revoke is unreliable
try {
const { execSync } = await import('child_process');
execSync(`bun run src/cli.ts auth revoke-client "${clientId}"`,
{ cwd: process.cwd(), encoding: 'utf8', stdio: 'pipe' });
} catch {}
const postgres = (await import('postgres')).default;
const sql = postgres(process.env.GBRAIN_DATABASE_URL || process.env.DATABASE_URL || '', { prepare: false });
await sql`DELETE FROM oauth_tokens WHERE client_id IN (SELECT client_id FROM oauth_clients WHERE client_name LIKE 'e2e-%')`;
await sql`DELETE FROM mcp_request_log WHERE token_name IN (SELECT client_id FROM oauth_clients WHERE client_name LIKE 'e2e-%')`;
await sql`DELETE FROM oauth_clients WHERE client_name LIKE 'e2e-%'`;
await sql`DELETE FROM mcp_request_log WHERE agent_name LIKE 'e2e-%'`;
await sql`DELETE FROM access_tokens WHERE name LIKE 'e2e-%'`;
await sql.end();
} catch (e) {
console.error('[e2e] Cleanup failed:', e instanceof Error ? e.message : e);
}
});
// Helper: mint a token with given scopes