@celilo/e2e 0.1.0 → 0.2.0

package/src/shared-infra.ts

@@ -58,7 +58,7 @@ export async function ensureSharedInfra(): Promise<void> {
     // Verify DNS is still healthy
     try {
       const result = run(
-        `docker compose -f ${SHARED_COMPOSE_FILE} -p ${SHARED_PROJECT_NAME} exec -T comcast-resolver dig @127.0.0.1 iamtheinternet.org NS +short +timeout=2`,
+        `docker compose -f ${SHARED_COMPOSE_FILE} -p ${SHARED_PROJECT_NAME} exec -T namecheap-dns dig @127.0.0.1 iamtheinternet.org SOA +short +timeout=2`,
         { cwd: getE2eDir(), timeout: 10_000 },
       );
       if (result.trim().length > 0) {
@@ -66,7 +66,7 @@ export async function ensureSharedInfra(): Promise<void> {
       }
     } catch {
       // DNS check failed — restart shared infra
-      console.log('[e2e] Shared infra DNS check failed, restarting...');
+      console.log('[progress:start] shared infra DNS check failed, restarting | shared infra restarted');
       await stopSharedInfra();
     }
   }
@@ -74,7 +74,7 @@ export async function ensureSharedInfra(): Promise<void> {
   const e2eDir = getE2eDir();
 
   // Clean up any stale shared infra resources
-  console.log('[e2e] Cleaning up stale shared infrastructure...');
+  console.log('[progress:start] cleaning up stale shared infrastructure | shared infra cleanup complete');
   try {
     run(`docker compose -f ${SHARED_COMPOSE_FILE} -p ${SHARED_PROJECT_NAME} down --volumes --remove-orphans`,
       { cwd: e2eDir, timeout: 30_000 });
@@ -94,33 +94,44 @@ export async function ensureSharedInfra(): Promise<void> {
   } catch {}
 
   try { run('docker network prune -f', { timeout: 10_000 }); } catch {}
+  try { run('docker volume prune -f', { timeout: 10_000 }); } catch {}
+
+  // Force-remove any leftover networks by name
+  try {
+    const staleNets = run('docker network ls --format "{{.Name}}"')
+      .split('\n')
+      .filter(n => n.startsWith('celilo-e2e'));
+    for (const net of staleNets) {
+      try { run(`docker network rm ${net}`, { timeout: 5_000 }); } catch {}
+    }
+  } catch {}
 
   // Generate and write compose file
   const yaml = generateSharedInfraYaml();
   writeFileSync(join(e2eDir, SHARED_COMPOSE_FILE), yaml);
 
   // Build and start
-  console.log('[e2e] Building shared infrastructure images...');
+  console.log('[progress:start] building shared infrastructure images | shared images built');
   run(`docker compose -f ${SHARED_COMPOSE_FILE} -p ${SHARED_PROJECT_NAME} build`,
     { cwd: e2eDir, timeout: 300_000 });
 
-  console.log('[e2e] Starting shared infrastructure...');
+  console.log('[progress:start] starting shared infrastructure | shared infra started');
   run(`docker compose -f ${SHARED_COMPOSE_FILE} -p ${SHARED_PROJECT_NAME} up -d`,
     { cwd: e2eDir, timeout: 120_000 });
 
   // Wait for DNS convergence
-  console.log('[e2e] Waiting for DNS convergence...');
+  console.log('[progress:start] waiting for DNS convergence | DNS converged');
   const start = Date.now();
   const timeout = 60_000;
   while (Date.now() - start < timeout) {
     try {
       const result = run(
-        `docker compose -f ${SHARED_COMPOSE_FILE} -p ${SHARED_PROJECT_NAME} exec -T comcast-resolver dig @127.0.0.1 iamtheinternet.org NS +short +timeout=2`,
+        `docker compose -f ${SHARED_COMPOSE_FILE} -p ${SHARED_PROJECT_NAME} exec -T namecheap-dns dig @127.0.0.1 iamtheinternet.org SOA +short +timeout=2`,
         { cwd: e2eDir, timeout: 10_000 },
       );
       if (result.trim().length > 0) {
         sharedInfraRunning = true;
-        console.log('[e2e] Shared infrastructure ready');
+        console.log('[progress:done] shared infrastructure ready');
         return;
       }
     } catch {
@@ -135,7 +146,7 @@ export async function ensureSharedInfra(): Promise<void> {
  * Stop the shared infrastructure. Called once at the end of the test suite.
  */
 export async function stopSharedInfra(): Promise<void> {
-  console.log('[e2e] Stopping shared infrastructure...');
+  console.log('[progress:start] stopping shared infrastructure | shared infra stopped');
   const e2eDir = getE2eDir();
   try {
     run(`docker compose -f ${SHARED_COMPOSE_FILE} -p ${SHARED_PROJECT_NAME} down --volumes --remove-orphans`,

package/src/types.ts

@@ -35,13 +35,38 @@ export interface ExecResult {
   exitCode: number;
 }
 
+/** Error thrown when a celilo CLI command exits non-zero */
+export class CeliloCommandError extends Error {
+  constructor(
+    public readonly cmd: string,
+    public readonly result: ExecResult,
+  ) {
+    const tail = result.stdout.slice(-500) + result.stderr.slice(-200);
+    super(`celilo ${cmd} failed (exit ${result.exitCode}):\n${tail}`);
+    this.name = 'CeliloCommandError';
+  }
+}
+
 export interface NetworkHandle {
-  /** Run a celilo CLI command on the management machine */
+  /**
+   * Run a celilo CLI command on the management machine.
+   * Throws CeliloCommandError on non-zero exit.
+   * Pass `{ check: false }` to get the raw ExecResult instead.
+   */
   celilo(cmd: string, timeoutMs?: number): Promise<ExecResult>;
+  celilo(cmd: string, opts: { check: false; timeoutMs?: number }): Promise<ExecResult>;
 
   /** Execute an arbitrary command in any container */
   exec(container: string, cmd: string, timeoutMs?: number): Promise<ExecResult>;
 
+  /**
+   * Pause the test and drop into an interactive shell for debugging.
+   * The test resumes when you exit the shell.
+   *
+   * @param container - Which container to shell into (default: 'management')
+   */
+  debug(container?: string): Promise<void>;
+
   /** Resolve a DNS name from the management machine */
   dig(name: string): Promise<string>;