WIP: Re-simplify tests now they're working to see what we _need_

Author: pimterry

.github/workflows/ci.yml

@@ -69,18 +69,12 @@ jobs:
 
       - name: Run smoke tests
         run: |
-          "$ANDROID_HOME/platform-tools/adb" start-server
-          ps xao pid,ppid,pgid,cmd --forest
-
           if [ "$RUNNER_OS" == "Linux" ]; then
             xvfb-run --auto-servernum npm test
           else
             npm test
           fi
         shell: bash
-        env:
-          DEBUG: pw:*
-          HTTPTOOLKIT_SERVER_DISABLE_AUTOUPDATE: 1 # Don't try to autoupdate during tests etc
 
       - uses: actions/upload-artifact@v4
         with:

src/index.ts

@@ -3,7 +3,7 @@ const DEV_MODE = process.env.HTK_DEV === 'true';
 // Set up error handling before everything else:
 import { logError, addBreadcrumb } from './errors.ts';
 
-import { spawn, ChildProcess, execSync } from 'child_process';
+import { spawn, ChildProcess } from 'child_process';
 import * as os from 'os';
 import { promises as fs, createWriteStream, WriteStream } from 'fs'
 import * as net from 'net';
@@ -154,15 +154,6 @@ if (!amMainInstance) {
                 console.log('Failed to kill server', error);
                 logError(error);
             } finally {
-                // Log at exit
-                execSync('ps xao pid,ppid,pgid,cmd --forest', {
-                    stdio: 'inherit'
-                });
-
-                if (process.stdin) process.stdin.destroy();
-                if (process.stdout) process.stdout.destroy();
-                if (process.stderr) process.stderr.destroy();
-
                 // We've done our best - now shut down for real.
                 app.quit();
             }
@@ -375,11 +366,6 @@ if (!amMainInstance) {
     }
 
     async function startServer(retries = 2) {
-        await delay(100);
-        execSync('ps xao pid,ppid,pgid,cmd --forest', {
-            stdio: 'inherit'
-        });
-
         logStream.write('Starting server\n');
         const binName = isWindows ? 'httptoolkit-server.cmd' : 'httptoolkit-server';
         const serverBinPath = path.join(RESOURCES_PATH, 'httptoolkit-server', 'bin', binName);

test/smoke.spec.ts

@@ -5,8 +5,12 @@ test('app launches and loads UI from server', async () => {
     const electronApp = await electron.launch({
         cwd: path.join(import.meta.dirname, '..'),
         args: ['.'],
-        timeout: 60000,
-        ...(process.env.CI && { env: { ...process.env, ELECTRON_ENABLE_LOGGING: '1' } })
+        timeout: 10000,
+        env: {
+            ...process.env,
+            // Disable auto-update during tests
+            'HTTPTOOLKIT_SERVER_DISABLE_AUTOUPDATE': '1'
+        }
     });
 
     electronApp.process().stdout?.on('data', (data) => {
@@ -19,15 +23,7 @@ test('app launches and loads UI from server', async () => {
     const window = await electronApp.firstWindow();
 
     await expect(window.evaluate(() => typeof (window as any).desktopApi !== 'undefined')).resolves.toBe(true);
-    console.log('saw desktopApi');
-
     await expect(window.locator('h1:has-text("Intercept HTTP")')).toBeVisible({ timeout: 60000 });
-    console.log('saw title');
-
-    electronApp.on('close', () => {
-        console.log('electron app close event');
-    });
 
-    // await electronApp.close();
-    // console.log('closed app');
+    await electronApp.close();
 });