fix(V2): resolve home org without shared-setup state in data-short

TheLastCicada · TheLastCicada · commit bf7c07b4130d · 2026-06-01T11:57:16.000-07:00
The non-home project wait loop called getSharedHomeOrgId(), which throws
unless runSharedSetup() ran in the same process. runSharedSetup only runs
inside the spawned mocha child processes, never in the data-short
orchestrator, so the accessor threw and main()'s catch called
process.exit(1) — crashing the entire V2 live-api run before the PUT and
DELETE phases.

Resolve the home org directly via getHomeOrgId(request) inside a
try/catch so the orchestrator no longer depends on child-process state.
diff --git a/tests/v2/live-api/data-short.js b/tests/v2/live-api/data-short.js
@@ -17,7 +17,6 @@ import {
   verifyMirrorRecordsBatch,
   closeMirrorDbPool,
 } from './helpers/mysql-mirror-helpers.js';
-import { getSharedHomeOrgId } from './helpers/shared-setup.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -357,7 +356,7 @@ async function main() {
     console.log('');
 
     // Clear staging table and ALL shared state before starting tests
-    const { getLiveApiRequest, clearStagingTable } = await import('./helpers/live-api-helpers.js');
+    const { getLiveApiRequest, clearStagingTable, getHomeOrgId } = await import('./helpers/live-api-helpers.js');
     const { clearAllState } = await import('./helpers/verification-state.js');
     // Use V2 API version for health checks since this uses V2 endpoints
     const request = await getLiveApiRequest({ apiVersion: 'v2' });
@@ -424,7 +423,14 @@ async function main() {
 
     // Wait for governance to sync at least one non-home project before PUT/DELETE
     // tests that verify ownership guards reject mutations on foreign records.
-    const homeOrgId = getSharedHomeOrgId();
+    // Resolve the home org directly here: shared-setup state lives in the spawned
+    // mocha child processes, not in this orchestrator process.
+    let homeOrgId = null;
+    try {
+      homeOrgId = await getHomeOrgId(request);
+    } catch (err) {
+      console.log(`  ⚠ Could not resolve home org id for non-home project wait: ${err.message}`);
+    }
     if (homeOrgId) {
       console.log('--- Waiting for non-home project from governance sync ---');
       const maxWaitMs = 600_000;
