@dionlarson/playwright-orchestrator-core 1.3.0 → 1.3.2

package/dist/commands/program.js

@@ -4,8 +4,11 @@ import run from './run.js';
 import create from './create.js';
 import createReport from './create-report.js';
 import { readFile } from 'node:fs/promises';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
 export const program = new Command();
-const package_json = JSON.parse(await readFile('node_modules/@playwright-orchestrator/core/package.json', 'utf-8'));
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const package_json = JSON.parse(await readFile(join(__dirname, '..', '..', 'package.json'), 'utf-8'));
 program
     .name('playwright-orchestrator')
     .description('CLI to orchestrate Playwright tests')

package/dist/helpers/plugin.js

@@ -1,7 +1,7 @@
 import { STORAGES } from '../plugins-list.js';
 export async function loadPluginModule(storage) {
     try {
-        const a = await import(`@playwright-orchestrator/${storage}`);
+        const a = await import(`@dionlarson/playwright-orchestrator-${storage}`);
         return a;
     }
     catch (error) {

package/dist/helpers/reporter-tools.js

@@ -17,5 +17,5 @@ export async function loadRunInfo(args) {
 }
 function buildCommand(args) {
     // last param wins, so we need to put our reporter at the end
-    return `npx playwright test --list ${args.join(' ')} --reporter "@playwright-orchestrator/core/tests-info-reporter"`;
+    return `npx playwright test --list ${args.join(' ')} --reporter "@dionlarson/playwright-orchestrator-core/tests-info-reporter"`;
 }

package/dist/test-runner.js

@@ -1,11 +1,40 @@
 import { createHash } from 'node:crypto';
-import child_process from 'node:child_process';
+import child_process, { spawn } from 'node:child_process';
 import { promisify } from 'node:util';
 import { rm, writeFile } from 'node:fs/promises';
 import { TestExecutionReporter } from './reporters/test-execution-reporter.js';
 import path from 'node:path';
 import * as uuid from 'uuid';
 const exec = promisify(child_process.exec);
+function spawnWithOutput(command, args, env) {
+    return new Promise((resolve, reject) => {
+        const proc = spawn(command, args, {
+            env,
+            shell: true,
+            stdio: ['inherit', 'pipe', 'inherit'] // stdin inherit, stdout pipe, stderr inherit
+        });
+        let stdout = '';
+        proc.stdout?.on('data', (data) => {
+            const str = data.toString();
+            stdout += str;
+            // Stream output but filter out the JSON reporter output
+            if (!str.trim().startsWith('{')) {
+                process.stdout.write(data);
+            }
+        });
+        proc.on('close', (code) => {
+            if (code === 0) {
+                resolve(stdout);
+            }
+            else {
+                const error = new Error(`Process exited with code ${code}`);
+                error.stdout = stdout;
+                reject(error);
+            }
+        });
+        proc.on('error', reject);
+    });
+}
 export class TestRunner {
     adapter;
     runId;
@@ -17,11 +46,14 @@ export class TestRunner {
         this.outputFolder = options.output;
     }
     async runTests() {
+        console.log(`[orchestrator] Starting shard for run ${this.runId}`);
         await this.removePreviousReports();
         const config = await this.adapter.startShard(this.runId);
+        console.log(`[orchestrator] Shard started. Workers: ${config.workers}, Config: ${config.configFile || 'default'}`);
         config.configFile = await this.createTempConfig(config.configFile);
         try {
             await this.runTestsUntilAvailable(config);
+            console.log(`[orchestrator] All tests completed, finishing shard`);
             await this.adapter.finishShard(this.runId);
             await this.adapter.dispose();
             this.reporter.printSummary();
@@ -33,9 +65,14 @@ export class TestRunner {
     }
     async runTestsUntilAvailable(config) {
         const runningTests = new Set();
+        console.log(`[orchestrator] Fetching first test...`);
         let next = await this.adapter.getNextTest(this.runId, config);
+        console.log(`[orchestrator] First test: ${next ? `[${next.project}] ${next.file}:${next.position}` : 'none available'}`);
+        let testCount = 0;
         while (next || runningTests.size > 0) {
             if (next && runningTests.size < config.workers) {
+                testCount++;
+                console.log(`[orchestrator] Running test #${testCount}: [${next.project}] ${next.file}:${next.position}`);
                 const testPromise = this.runTest(next, config).then(() => {
                     runningTests.delete(testPromise);
                 });
@@ -46,6 +83,7 @@ export class TestRunner {
                 await Promise.race(runningTests);
             }
         }
+        console.log(`[orchestrator] Finished ${testCount} tests`);
         await Promise.all(runningTests);
     }
     async removePreviousReports() {
@@ -55,15 +93,14 @@ export class TestRunner {
         const testPosition = `${test.file}:${test.position}`;
         const testName = `[${test.project}] > ${testPosition}`;
         const testHash = createHash('md5').update(testName).digest('hex');
+        const args = [testPosition, ...this.buildParams(test, config, testHash).split(' ')];
+        const env = {
+            ...process.env,
+            PLAYWRIGHT_BLOB_OUTPUT_FILE: `${this.outputFolder}/${testHash}.zip`,
+        };
         try {
-            const run = exec(`npx playwright test ${testPosition} ${this.buildParams(test, config, testHash)}`, {
-                env: {
-                    ...process.env,
-                    PLAYWRIGHT_BLOB_OUTPUT_FILE: `${this.outputFolder}/${testHash}.zip`,
-                },
-            });
-            this.reporter.addTest(test, run);
-            const { stdout } = await run;
+            const stdout = await spawnWithOutput('npx', ['playwright', 'test', ...args], env);
+            this.reporter.finishTest(test);
             await this.adapter.finishTest({
                 runId: this.runId,
                 test,
@@ -74,6 +111,7 @@ export class TestRunner {
         catch (error) {
             if (!error.stdout)
                 throw error;
+            this.reporter.failTest(test);
             await this.adapter.failTest({
                 runId: this.runId,
                 test,
@@ -88,7 +126,7 @@ export class TestRunner {
     buildParams(test, config, testHash) {
         const args = [...config.args];
         args.push('--workers', '1');
-        args.push('--reporter', 'blob,@playwright-orchestrator/core/test-result-reporter');
+        args.push('--reporter', 'blob,@dionlarson/playwright-orchestrator-core/test-result-reporter');
         args.push('--project', `"${test.project}"`);
         args.push('--output', `"${this.outputFolder}/${testHash}"`);
         if (config.configFile) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dionlarson/playwright-orchestrator-core",
-    "version": "1.3.0",
+    "version": "1.3.2",
     "description": "Core lib and cli for Playwright test orchestration",
     "keywords": [
         "playwright",