playwright 1.40.0 → 1.40.1

package/lib/common/test.js

@@ -198,9 +198,6 @@ class TestCase extends Base {
     this._poolDigest = '';
     this._workerHash = '';
     this._projectId = '';
-    // This is different from |results.length| because sometimes we do not run the test, but consume
-    // an attempt, for example when skipping tests in a serial suite after a failure.
-    this._runAttempts = 0;
     // Annotations known statically before running the test, e.g. `test.skip()` or `test.describe.skip()`.
     this._staticAnnotations = [];
     this.fn = fn;
@@ -213,9 +210,16 @@ class TestCase extends Base {
     return titlePath;
   }
   outcome() {
-    const results = this.results.filter(result => result.status !== 'interrupted');
-    if (results.every(result => result.status === 'skipped')) return 'skipped';
-    const failures = results.filter(result => result.status !== this.expectedStatus);
+    // Ignore initial skips that may be a result of "skipped because previous test in serial mode failed".
+    const results = [...this.results];
+    while (((_results$ = results[0]) === null || _results$ === void 0 ? void 0 : _results$.status) === 'skipped' || ((_results$2 = results[0]) === null || _results$2 === void 0 ? void 0 : _results$2.status) === 'interrupted') {
+      var _results$, _results$2;
+      results.shift();
+    }
+
+    // All runs were skipped.
+    if (!results.length) return 'skipped';
+    const failures = results.filter(result => result.status !== 'skipped' && result.status !== 'interrupted' && result.status !== this.expectedStatus);
     if (!failures.length)
       // all passed
       return 'expected';

package/lib/isomorphic/teleReceiver.js

@@ -356,9 +356,16 @@ class TeleTestCase {
     return titlePath;
   }
   outcome() {
-    const results = this.results.filter(result => result.status !== 'interrupted');
-    if (results.every(result => result.status === 'skipped')) return 'skipped';
-    const failures = results.filter(result => result.status !== this.expectedStatus);
+    // Ignore initial skips that may be a result of "skipped because previous test in serial mode failed".
+    const results = [...this.results];
+    while (((_results$ = results[0]) === null || _results$ === void 0 ? void 0 : _results$.status) === 'skipped' || ((_results$2 = results[0]) === null || _results$2 === void 0 ? void 0 : _results$2.status) === 'interrupted') {
+      var _results$, _results$2;
+      results.shift();
+    }
+
+    // All runs were skipped.
+    if (!results.length) return 'skipped';
+    const failures = results.filter(result => result.status !== 'skipped' && result.status !== 'interrupted' && result.status !== this.expectedStatus);
     if (!failures.length)
       // all passed
       return 'expected';

package/lib/reporters/merge.js

@@ -78,11 +78,26 @@ const commonEventNames = ['onBlobReportMetadata', 'onConfigure', 'onProject', 'o
 const commonEvents = new Set(commonEventNames);
 const commonEventRegex = new RegExp(`${commonEventNames.join('|')}`);
 function parseCommonEvents(reportJsonl) {
-  return reportJsonl.toString().split('\n').filter(line => commonEventRegex.test(line)) // quick filter
+  return splitBufferLines(reportJsonl).map(line => line.toString('utf8')).filter(line => commonEventRegex.test(line)) // quick filter
   .map(line => JSON.parse(line)).filter(event => commonEvents.has(event.method));
 }
 function parseTestEvents(reportJsonl) {
-  return reportJsonl.toString().split('\n').filter(line => line.length).map(line => JSON.parse(line)).filter(event => !commonEvents.has(event.method));
+  return splitBufferLines(reportJsonl).map(line => line.toString('utf8')).filter(line => line.length).map(line => JSON.parse(line)).filter(event => !commonEvents.has(event.method));
+}
+function splitBufferLines(buffer) {
+  const lines = [];
+  let start = 0;
+  while (start < buffer.length) {
+    // 0x0A is the byte for '\n'
+    const end = buffer.indexOf(0x0A, start);
+    if (end === -1) {
+      lines.push(buffer.slice(start));
+      break;
+    }
+    lines.push(buffer.slice(start, end));
+    start = end + 1;
+  }
+  return lines;
 }
 async function extractAndParseReports(dir, shardFiles, internalizer, printStatus) {
   const shardEvents = [];

package/lib/runner/dispatcher.js

@@ -283,7 +283,7 @@ class JobDispatcher {
     test.expectedStatus = params.expectedStatus;
     test.annotations = params.annotations;
     test.timeout = params.timeout;
-    const isFailure = result.status !== test.expectedStatus;
+    const isFailure = result.status !== 'skipped' && result.status !== test.expectedStatus;
     if (isFailure) this._failedTests.add(test);
     this._reportTestEnd(test, result);
     this._currentlyRunning = undefined;
@@ -364,16 +364,21 @@ class JobDispatcher {
     }
     result.errors = [...errors];
     result.error = result.errors[0];
-    result.status = 'failed';
+    result.status = errors.length ? 'failed' : 'skipped';
     this._reportTestEnd(test, result);
     this._failedTests.add(test);
   }
-  _handleFatalErrors(errors) {
-    const test = this._remainingByTestId.values().next().value;
-    if (test) {
-      this._failTestWithErrors(test, errors);
+  _massSkipTestsFromRemaining(testIds, errors) {
+    for (const test of this._remainingByTestId.values()) {
+      if (!testIds.has(test.id)) continue;
+      if (!this._failureTracker.hasReachedMaxFailures()) {
+        this._failTestWithErrors(test, errors);
+        errors = []; // Only report errors for the first test.
+      }
+
       this._remainingByTestId.delete(test.id);
-    } else if (errors.length) {
+    }
+    if (errors.length) {
       // We had fatal errors after all tests have passed - most likely in some teardown.
       // Let's just fail the test run.
       this._failureTracker.onWorkerError();
@@ -401,26 +406,19 @@ class JobDispatcher {
       }
     }
     if (params.fatalErrors.length) {
-      // In case of fatal errors, report the first remaining test as failing with these errors,
-      // and "skip" all other tests to avoid running into the same issue over and over.
-      this._handleFatalErrors(params.fatalErrors);
-      this._remainingByTestId.clear();
+      // In case of fatal errors, report first remaining test as failing with these errors,
+      // and all others as skipped.
+      this._massSkipTestsFromRemaining(new Set(this._remainingByTestId.keys()), params.fatalErrors);
     }
-
     // Handle tests that should be skipped because of the setup failure.
-    for (const testId of params.skipTestsDueToSetupFailure) this._remainingByTestId.delete(testId);
+    this._massSkipTestsFromRemaining(new Set(params.skipTestsDueToSetupFailure), []);
     if (params.unexpectedExitError) {
-      if (this._currentlyRunning) {
-        // When worker exits during a test, we blame the test itself.
-        this._failTestWithErrors(this._currentlyRunning.test, [params.unexpectedExitError]);
-        this._remainingByTestId.delete(this._currentlyRunning.test.id);
-      } else {
-        // The most common situation when worker exits while not running a test is:
-        //   worker failed to require the test file (at the start) because of an exception in one of imports.
-        // In this case, "skip" all remaining tests, to avoid running into the same exception over and over.
-        this._handleFatalErrors([params.unexpectedExitError]);
-        this._remainingByTestId.clear();
-      }
+      // When worker exits during a test, we blame the test itself.
+      //
+      // The most common situation when worker exits while not running a test is:
+      //   worker failed to require the test file (at the start) because of an exception in one of imports.
+      // In this case, "skip" all remaining tests, to avoid running into the same exception over and over.
+      if (this._currentlyRunning) this._massSkipTestsFromRemaining(new Set([this._currentlyRunning.test.id]), [params.unexpectedExitError]);else this._massSkipTestsFromRemaining(new Set(this._remainingByTestId.keys()), [params.unexpectedExitError]);
     }
     const retryCandidates = new Set();
     const serialSuitesWithFailures = new Set();
@@ -432,20 +430,24 @@ class JobDispatcher {
       }
       if (outermostSerialSuite) serialSuitesWithFailures.add(outermostSerialSuite);
     }
+
+    // If we have failed tests that belong to a serial suite,
+    // we should skip all future tests from the same serial suite.
+    const testsBelongingToSomeSerialSuiteWithFailures = [...this._remainingByTestId.values()].filter(test => {
+      let parent = test.parent;
+      while (parent && !serialSuitesWithFailures.has(parent)) parent = parent.parent;
+      return !!parent;
+    });
+    this._massSkipTestsFromRemaining(new Set(testsBelongingToSomeSerialSuiteWithFailures.map(test => test.id)), []);
     for (const serialSuite of serialSuitesWithFailures) {
-      serialSuite.allTests().forEach(test => {
-        // Skip remaining tests from serial suites with failures.
-        this._remainingByTestId.delete(test.id);
-        // Schedule them for the retry all together.
-        retryCandidates.add(test);
-      });
-    }
-    for (const test of this._job.tests) {
-      if (!this._remainingByTestId.has(test.id)) ++test._runAttempts;
+      // Add all tests from failed serial suites for possible retry.
+      // These will only be retried together, because they have the same
+      // "retries" setting and the same number of previous runs.
+      serialSuite.allTests().forEach(test => retryCandidates.add(test));
     }
     const remaining = [...this._remainingByTestId.values()];
     for (const test of retryCandidates) {
-      if (test._runAttempts < test.retries + 1) remaining.push(test);
+      if (test.results.length < test.retries + 1) remaining.push(test);
     }
 
     // This job is over, we will schedule another one.

package/lib/runner/failureTracker.js

@@ -31,7 +31,7 @@ class FailureTracker {
     this._rootSuite = rootSuite;
   }
   onTestEnd(test, result) {
-    if (result.status !== test.expectedStatus) ++this._failureCount;
+    if (result.status !== 'skipped' && result.status !== test.expectedStatus) ++this._failureCount;
   }
   onWorkerError() {
     this._hasWorkerErrors = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playwright",
-  "version": "1.40.0",
+  "version": "1.40.1",
   "description": "A high-level API to automate web browsers",
   "repository": {
     "type": "git",
@@ -54,7 +54,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "playwright-core": "1.40.0"
+    "playwright-core": "1.40.1"
   },
   "optionalDependencies": {
     "fsevents": "2.3.2"