test: fix docker-warning tests and fragile timing dependencies

.github/workflows/test-integration-suite.yml

@@ -161,7 +161,7 @@ jobs:
         run: |
           echo "=== Running container & ops tests ==="
           npm run test:integration -- \
-            --testPathPatterns="(container-workdir|docker-warning|environment-variables|error-handling|exit-code-propagation|log-commands|no-docker|volume-mounts)" \
+            --testPathPatterns="(container-workdir|environment-variables|error-handling|exit-code-propagation|log-commands|no-docker|volume-mounts)" \
             --verbose
         env:
           JEST_TIMEOUT: 180000

scripts/ci/cleanup.sh

@@ -12,7 +12,7 @@ echo "==========================================="
 
 # First, explicitly remove containers by name (handles orphaned containers)
 echo "Removing awf containers by name..."
-docker rm -f awf-squid awf-agent 2>/dev/null || true
+docker rm -f awf-squid awf-agent awf-api-proxy 2>/dev/null || true
 
 # Cleanup diagnostic test containers
 echo "Stopping docker compose services..."

src/cli.test.ts

@@ -48,14 +48,14 @@
 
     afterEach(() => {
       // Clean up the test directory
       if (fs.existsSync(testDir)) {
         fs.rmSync(testDir, { recursive: true, force: true });
       }
     });
 
     it('should parse domains from file with one domain per line', () => {
       const filePath = path.join(testDir, 'domains.txt');
       fs.writeFileSync(filePath, 'github.com\napi.github.com\nnpmjs.org');
 
       const result = parseDomainsFile(filePath);
 
@@ -64,7 +64,7 @@
 
     it('should parse comma-separated domains from file', () => {
       const filePath = path.join(testDir, 'domains.txt');
       fs.writeFileSync(filePath, 'github.com, api.github.com, npmjs.org');
 
       const result = parseDomainsFile(filePath);
 
@@ -73,7 +73,7 @@
 
     it('should handle mixed formats (lines and commas)', () => {
       const filePath = path.join(testDir, 'domains.txt');
       fs.writeFileSync(filePath, 'github.com\napi.github.com, npmjs.org\nexample.com');
 
       const result = parseDomainsFile(filePath);
 
@@ -82,7 +82,7 @@
 
     it('should skip empty lines', () => {
       const filePath = path.join(testDir, 'domains.txt');
       fs.writeFileSync(filePath, 'github.com\n\n\napi.github.com\n\nnpmjs.org');
 
       const result = parseDomainsFile(filePath);
 
@@ -91,7 +91,7 @@
 
     it('should skip lines with only whitespace', () => {
       const filePath = path.join(testDir, 'domains.txt');
       fs.writeFileSync(filePath, 'github.com\n   \n\t\napi.github.com');
 
       const result = parseDomainsFile(filePath);
 
@@ -100,7 +100,7 @@
 
     it('should skip comments starting with #', () => {
       const filePath = path.join(testDir, 'domains.txt');
       fs.writeFileSync(filePath, '# This is a comment\ngithub.com\n# Another comment\napi.github.com');
 
       const result = parseDomainsFile(filePath);
 
@@ -109,7 +109,7 @@
 
     it('should handle inline comments (after domain)', () => {
       const filePath = path.join(testDir, 'domains.txt');
       fs.writeFileSync(filePath, 'github.com # GitHub main domain\napi.github.com # API endpoint');
 
       const result = parseDomainsFile(filePath);
 
@@ -118,7 +118,7 @@
 
     it('should handle domains with inline comments in comma-separated format', () => {
       const filePath = path.join(testDir, 'domains.txt');
       fs.writeFileSync(filePath, 'github.com, api.github.com # GitHub domains\nnpmjs.org');
 
       const result = parseDomainsFile(filePath);
 
@@ -133,7 +133,7 @@
 
     it('should return empty array for file with only comments and whitespace', () => {
       const filePath = path.join(testDir, 'domains.txt');
       fs.writeFileSync(filePath, '# Comment 1\n\n# Comment 2\n   \n');
 
       const result = parseDomainsFile(filePath);
 
@@ -350,8 +350,8 @@
         .option('--build-local', 'Build locally', false)
         .option('--env-all', 'Pass all env vars', false);
 
-      // Parse empty args to get defaults
-      program.parse([], { from: 'user' });
+      // Parse empty args to get defaults (from: 'node' treats argv[0] as node, argv[1] as script)
+      program.parse(['node', 'awf'], { from: 'node' });
       const opts = program.opts();
 
       expect(opts.logLevel).toBe('info');

src/docker-manager.test.ts

@@ -2106,7 +2106,7 @@ describe('docker-manager', () => {
 
       expect(mockExecaFn).toHaveBeenCalledWith(
         'docker',
-        ['rm', '-f', 'awf-squid', 'awf-agent'],
+        ['rm', '-f', 'awf-squid', 'awf-agent', 'awf-api-proxy'],
         { reject: false }
       );
     });

src/docker-manager.ts

@@ -1347,7 +1347,7 @@ export async function startContainers(workDir: string, allowedDomains: string[],
   // This handles orphaned containers from failed/interrupted previous runs
   logger.debug('Removing any existing containers with conflicting names...');
   try {
-    await execa('docker', ['rm', '-f', 'awf-squid', 'awf-agent'], {
+    await execa('docker', ['rm', '-f', 'awf-squid', 'awf-agent', 'awf-api-proxy'], {
       reject: false,
     });
   } catch {

tests/fixtures/awf-runner.ts

@@ -142,20 +142,6 @@ export class AwfRunner {
       }
     }
 
-    // Add rate limit flags
-    if (options.rateLimitRpm !== undefined) {
-      args.push('--rate-limit-rpm', String(options.rateLimitRpm));
-    }
-    if (options.rateLimitRph !== undefined) {
-      args.push('--rate-limit-rph', String(options.rateLimitRph));
-    }
-    if (options.rateLimitBytesPm !== undefined) {
-      args.push('--rate-limit-bytes-pm', String(options.rateLimitBytesPm));
-    }
-    if (options.noRateLimit) {
-      args.push('--no-rate-limit');
-    }
-
     // Add -- separator before command
     args.push('--');
 
@@ -336,20 +322,6 @@ export class AwfRunner {
       }
     }
 
-    // Add rate limit flags
-    if (options.rateLimitRpm !== undefined) {
-      args.push('--rate-limit-rpm', String(options.rateLimitRpm));
-    }
-    if (options.rateLimitRph !== undefined) {
-      args.push('--rate-limit-rph', String(options.rateLimitRph));
-    }
-    if (options.rateLimitBytesPm !== undefined) {
-      args.push('--rate-limit-bytes-pm', String(options.rateLimitBytesPm));
-    }
-    if (options.noRateLimit) {
-      args.push('--no-rate-limit');
-    }
-
     // Add -- separator before command
     args.push('--');
 

tests/fixtures/cleanup.ts

@@ -25,7 +25,7 @@ export class Cleanup {
   async removeContainers(): Promise<void> {
     this.log('Removing awf containers by name...');
     try {
-      await execa('docker', ['rm', '-f', 'awf-squid', 'awf-agent']);
+      await execa('docker', ['rm', '-f', 'awf-squid', 'awf-agent', 'awf-api-proxy']);
     } catch (error) {
       // Ignore errors (containers may not exist)
     }

tests/integration/log-commands.test.ts

@@ -43,18 +43,21 @@ describe('Log Commands', () => {
     expect(result).toSucceed();
 
     // Check that logs were created
-    if (result.workDir) {
-      const squidLogPath = path.join(result.workDir, 'squid-logs', 'access.log');
+    // workDir extraction depends on parsing stderr logs, which may not always work
+    // (e.g., sudo may buffer/redirect stderr differently in CI)
+    if (!result.workDir) {
+      console.warn('WARN: workDir not extracted from stderr — skipping log file assertions');
+      return;
+    }
+    const squidLogPath = path.join(result.workDir, 'squid-logs', 'access.log');
 
-      // Logs may not be immediately available due to buffering
-      // Wait a moment for logs to be flushed
-      await new Promise(resolve => setTimeout(resolve, 1000));
+    // Logs may not be immediately available due to buffering
+    // Wait a moment for logs to be flushed
+    await new Promise(resolve => setTimeout(resolve, 1000));
 
-      if (fs.existsSync(squidLogPath)) {
-        const logContent = fs.readFileSync(squidLogPath, 'utf-8');
-        expect(logContent.length).toBeGreaterThan(0);
-      }
-    }
+    expect(fs.existsSync(squidLogPath)).toBe(true);
+    const logContent = fs.readFileSync(squidLogPath, 'utf-8');
+    expect(logContent.length).toBeGreaterThan(0);
 
     // Cleanup after test
     await cleanup(false);
@@ -72,27 +75,27 @@ describe('Log Commands', () => {
     );
 
     // First curl should succeed, second should fail
-    if (result.workDir) {
-      const squidLogPath = path.join(result.workDir, 'squid-logs', 'access.log');
-
-      await new Promise(resolve => setTimeout(resolve, 1000));
-
-      if (fs.existsSync(squidLogPath)) {
-        const logContent = fs.readFileSync(squidLogPath, 'utf-8');
-        const parser = createLogParser();
-        const entries = parser.parseSquidLog(logContent);
-
-        // Should have at least one entry
-        if (entries.length > 0) {
-          // Verify entry structure
-          const entry = entries[0];
-          expect(entry).toHaveProperty('timestamp');
-          expect(entry).toHaveProperty('host');
-          expect(entry).toHaveProperty('statusCode');
-          expect(entry).toHaveProperty('decision');
-        }
-      }
+    if (!result.workDir) {
+      console.warn('WARN: workDir not extracted from stderr — skipping log file assertions');
+      return;
     }
+    const squidLogPath2 = path.join(result.workDir, 'squid-logs', 'access.log');
+
+    await new Promise(resolve => setTimeout(resolve, 1000));
+
+    expect(fs.existsSync(squidLogPath2)).toBe(true);
+    const logContent = fs.readFileSync(squidLogPath2, 'utf-8');
+    const parser = createLogParser();
+    const entries = parser.parseSquidLog(logContent);
+
+    // Should have at least one entry
+    expect(entries.length).toBeGreaterThan(0);
+    // Verify entry structure
+    const entry = entries[0];
+    expect(entry).toHaveProperty('timestamp');
+    expect(entry).toHaveProperty('host');
+    expect(entry).toHaveProperty('statusCode');
+    expect(entry).toHaveProperty('decision');
 
     await cleanup(false);
   }, 120000);
@@ -108,27 +111,28 @@ describe('Log Commands', () => {
       }
     );
 
-    if (result.workDir) {
-      const squidLogPath = path.join(result.workDir, 'squid-logs', 'access.log');
+    if (!result.workDir) {
+      console.warn('WARN: workDir not extracted from stderr — skipping log file assertions');
+      return;
+    }
+    const squidLogPath3 = path.join(result.workDir, 'squid-logs', 'access.log');
+
+    await new Promise(resolve => setTimeout(resolve, 1000));
 
-      await new Promise(resolve => setTimeout(resolve, 1000));
+    expect(fs.existsSync(squidLogPath3)).toBe(true);
+    const logContent3 = fs.readFileSync(squidLogPath3, 'utf-8');
+    const parser3 = createLogParser();
+    const entries3 = parser3.parseSquidLog(logContent3);
 
-      if (fs.existsSync(squidLogPath)) {
-        const logContent = fs.readFileSync(squidLogPath, 'utf-8');
-        const parser = createLogParser();
-        const entries = parser.parseSquidLog(logContent);
+    // Should have at least one entry
+    expect(entries3.length).toBeGreaterThan(0);
 
-        // Filter by decision
-        const allowed = parser.filterByDecision(entries, 'allowed');
-        const blocked = parser.filterByDecision(entries, 'blocked');
+    // Filter by decision
+    const allowed = parser3.filterByDecision(entries3, 'allowed');
+    const blocked = parser3.filterByDecision(entries3, 'blocked');
 
-        // We should have at least one allowed (github.com) and one blocked (example.com)
-        // Note: Log parsing depends on timing and buffering
-        if (entries.length > 0) {
-          expect(allowed.length + blocked.length).toBeGreaterThanOrEqual(1);
-        }
-      }
-    }
+    // We should have at least one allowed (github.com) and one blocked (example.com)
+    expect(allowed.length + blocked.length).toBeGreaterThanOrEqual(1);
 
     await cleanup(false);
   }, 180000);

tests/integration/no-docker.test.ts

@@ -15,6 +15,10 @@
  *
  * Known Issue: Building locally may fail due to NodeSource repository issues.
  * If tests fail with "docker found" errors, the images need to be rebuilt and published.
+ *
+ * NOTE: docker-warning.test.ts was removed as redundant — the Docker stub-script
+ * approach was superseded by removing docker-cli entirely. This file covers the
+ * Docker removal behavior (command not found, no socket, graceful failure).
  */
 
 /// <reference path="../jest-custom-matchers.d.ts" />