test: fix docker-warning tests and fragile timing dependencies

Mossaka · claude · Mossaka · commit 7286fca7bc8f · 2026-02-25T20:03:44.000Z
- Remove docker-warning.test.ts: skipped tests were redundant with no-docker.test.ts which already covers Docker removal behavior - Replace sleep 7 with retry loops in token-unset.test.ts: polls /proc/1/environ every 1s up to 15s instead of fixed sleep - Replace if(existsSync()) guards with hard expect() assertions in log-commands.test.ts so tests fail loudly instead of passing vacuously Closes #1046 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
diff --git a/tests/integration/docker-warning.test.ts b/tests/integration/docker-warning.test.ts
diff --git a/tests/integration/log-commands.test.ts b/tests/integration/log-commands.test.ts
@@ -43,18 +43,16 @@ describe('Log Commands', () => {
     expect(result).toSucceed();
 
     // Check that logs were created
-    if (result.workDir) {
-      const squidLogPath = path.join(result.workDir, 'squid-logs', 'access.log');
+    expect(result.workDir).toBeTruthy();
+    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 +70,24 @@ 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');
-        }
-      }
-    }
+    expect(result.workDir).toBeTruthy();
+    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 +103,25 @@ describe('Log Commands', () => {
       }
     );
 
-    if (result.workDir) {
-      const squidLogPath = path.join(result.workDir, 'squid-logs', 'access.log');
+    expect(result.workDir).toBeTruthy();
+    const squidLogPath3 = path.join(result.workDir!, 'squid-logs', 'access.log');
 
-      await new Promise(resolve => setTimeout(resolve, 1000));
+    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);
+    expect(fs.existsSync(squidLogPath3)).toBe(true);
+    const logContent3 = fs.readFileSync(squidLogPath3, 'utf-8');
+    const parser3 = createLogParser();
+    const entries3 = parser3.parseSquidLog(logContent3);
 
-        // Filter by decision
-        const allowed = parser.filterByDecision(entries, 'allowed');
-        const blocked = parser.filterByDecision(entries, 'blocked');
+    // Should have at least one entry
+    expect(entries3.length).toBeGreaterThan(0);
 
-        // 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);
-        }
-      }
-    }
+    // 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)
+    expect(allowed.length + blocked.length).toBeGreaterThanOrEqual(1);
 
     await cleanup(false);
   }, 180000);
diff --git a/tests/integration/no-docker.test.ts b/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" />
diff --git a/tests/integration/token-unset.test.ts b/tests/integration/token-unset.test.ts
@@ -26,17 +26,21 @@ describe('Token Unsetting from Entrypoint Environ', () => {
   test('should unset GITHUB_TOKEN from /proc/1/environ after agent starts', async () => {
     const testToken = 'ghp_test_token_12345678901234567890';
 
-    // Command that checks /proc/1/environ after sleeping to allow token unsetting
+    // Command that polls /proc/1/environ until token is cleared (retry loop)
     const command = `
-      # Wait for entrypoint to unset tokens (5 second delay + 2 second buffer)
-      sleep 7
-
-      # Check if GITHUB_TOKEN is still in /proc/1/environ
+      # Poll /proc/1/environ until GITHUB_TOKEN is cleared (up to 15 seconds)
+      for i in $(seq 1 15); do
+        if ! cat /proc/1/environ | tr "\\0" "\\n" | grep -q "GITHUB_TOKEN="; then
+          echo "SUCCESS: GITHUB_TOKEN cleared from /proc/1/environ"
+          break
+        fi
+        sleep 1
+      done
+
+      # Final check - fail if still present after retries
       if cat /proc/1/environ | tr "\\0" "\\n" | grep -q "GITHUB_TOKEN="; then
-        echo "ERROR: GITHUB_TOKEN still in /proc/1/environ"
+        echo "ERROR: GITHUB_TOKEN still in /proc/1/environ after 15 seconds"
         exit 1
-      else
-        echo "SUCCESS: GITHUB_TOKEN cleared from /proc/1/environ"
       fi
 
       # Verify agent can still read the token (cached by one-shot-token library)
@@ -66,13 +70,18 @@ describe('Token Unsetting from Entrypoint Environ', () => {
     const testToken = 'sk-test_openai_key_1234567890';
 
     const command = `
-      sleep 7
+      # Poll /proc/1/environ until OPENAI_API_KEY is cleared (up to 15 seconds)
+      for i in $(seq 1 15); do
+        if ! cat /proc/1/environ | tr "\\0" "\\n" | grep -q "OPENAI_API_KEY="; then
+          echo "SUCCESS: OPENAI_API_KEY cleared from /proc/1/environ"
+          break
+        fi
+        sleep 1
+      done
 
       if cat /proc/1/environ | tr "\\0" "\\n" | grep -q "OPENAI_API_KEY="; then
-        echo "ERROR: OPENAI_API_KEY still in /proc/1/environ"
+        echo "ERROR: OPENAI_API_KEY still in /proc/1/environ after 15 seconds"
         exit 1
-      else
-        echo "SUCCESS: OPENAI_API_KEY cleared from /proc/1/environ"
       fi
 
       if [ -n "$OPENAI_API_KEY" ]; then
@@ -101,13 +110,18 @@ describe('Token Unsetting from Entrypoint Environ', () => {
     const testToken = 'sk-ant-test_key_1234567890';
 
     const command = `
-      sleep 7
+      # Poll /proc/1/environ until ANTHROPIC_API_KEY is cleared (up to 15 seconds)
+      for i in $(seq 1 15); do
+        if ! cat /proc/1/environ | tr "\\0" "\\n" | grep -q "ANTHROPIC_API_KEY="; then
+          echo "SUCCESS: ANTHROPIC_API_KEY cleared from /proc/1/environ"
+          break
+        fi
+        sleep 1
+      done
 
       if cat /proc/1/environ | tr "\\0" "\\n" | grep -q "ANTHROPIC_API_KEY="; then
-        echo "ERROR: ANTHROPIC_API_KEY still in /proc/1/environ"
+        echo "ERROR: ANTHROPIC_API_KEY still in /proc/1/environ after 15 seconds"
         exit 1
-      else
-        echo "SUCCESS: ANTHROPIC_API_KEY cleared from /proc/1/environ"
       fi
 
       if [ -n "$ANTHROPIC_API_KEY" ]; then
@@ -134,9 +148,19 @@ describe('Token Unsetting from Entrypoint Environ', () => {
 
   test('should unset multiple tokens simultaneously', async () => {
     const command = `
-      sleep 7
-
-      # Check all three tokens
+      # Poll /proc/1/environ until all tokens are cleared (up to 15 seconds)
+      for i in $(seq 1 15); do
+        TOKENS_FOUND=0
+        cat /proc/1/environ | tr "\\0" "\\n" | grep -q "GITHUB_TOKEN=" && TOKENS_FOUND=$((TOKENS_FOUND + 1))
+        cat /proc/1/environ | tr "\\0" "\\n" | grep -q "OPENAI_API_KEY=" && TOKENS_FOUND=$((TOKENS_FOUND + 1))
+        cat /proc/1/environ | tr "\\0" "\\n" | grep -q "ANTHROPIC_API_KEY=" && TOKENS_FOUND=$((TOKENS_FOUND + 1))
+        if [ $TOKENS_FOUND -eq 0 ]; then
+          break
+        fi
+        sleep 1
+      done
+
+      # Final check - fail if any still present
       TOKENS_FOUND=0
 
       if cat /proc/1/environ | tr "\\0" "\\n" | grep -q "GITHUB_TOKEN="; then
@@ -187,10 +211,16 @@ describe('Token Unsetting from Entrypoint Environ', () => {
 
   test('should work in non-chroot mode', async () => {
     const command = `
-      sleep 7
+      # Poll /proc/1/environ until GITHUB_TOKEN is cleared (up to 15 seconds)
+      for i in $(seq 1 15); do
+        if ! cat /proc/1/environ | tr "\\0" "\\n" | grep -q "GITHUB_TOKEN="; then
+          break
+        fi
+        sleep 1
+      done
 
       if cat /proc/1/environ | tr "\\0" "\\n" | grep -q "GITHUB_TOKEN="; then
-        echo "ERROR: GITHUB_TOKEN still in /proc/1/environ"
+        echo "ERROR: GITHUB_TOKEN still in /proc/1/environ after 15 seconds"
         exit 1
       else
         echo "SUCCESS: GITHUB_TOKEN cleared from /proc/1/environ in non-chroot mode"
