@brillout/test-e2e 0.5.17 → 0.5.19

package/dist/buildTs.js

@@ -28,7 +28,7 @@ async function buildTs(entry, outfile) {
         fs_1.default.unlinkSync(sourceMapFile);
     }
     const clean = () => {
-        if (utils_1.cliConfig.debugEsbuild) {
+        if (utils_1.cliOptions.debugEsbuild) {
             return;
         }
         fs_1.default.unlinkSync(`${outfile}`);

package/dist/run.js

@@ -10,7 +10,7 @@ const page_1 = require("./page");
 const TIMEOUTS_1 = require("./TIMEOUTS");
 function run(cmd, { 
 //baseUrl = '',
-additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect = utils_1.cliConfig.inspect, cwd, doNotFailOnWarning, serverUrl, isFlaky, } = {}) {
+additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect = utils_1.cliOptions.inspect, cwd, doNotFailOnWarning, serverUrl, isFlaky, } = {}) {
     (0, utils_2.assert)(cwd === undefined);
     additionalTimeout += serverIsReadyDelay;
     (0, getCurrentTest_1.setRunInfo)({
@@ -23,7 +23,7 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
     if (inspect) {
         Logs_1.Logs.logEagerly = 'all';
     }
-    else if (utils_1.cliConfig.verbose) {
+    else if (utils_1.cliOptions.verbose) {
         Logs_1.Logs.logEagerly = 'logs';
     }
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();

package/dist/runAll.js

@@ -5,7 +5,6 @@ const getCurrentTest_1 = require("./getCurrentTest");
 const Logs_1 = require("./Logs");
 const utils_1 = require("./utils");
 const utils_2 = require("./utils");
-const parallel_ci_1 = require("./parallel-ci");
 const getCurrentTest_2 = require("./getCurrentTest");
 const getBrowser_1 = require("./getBrowser");
 const buildTs_1 = require("./buildTs");
@@ -36,30 +35,46 @@ exports.runAll = runAll;
 async function runTestFiles(testFiles, browser) {
     // First attempt
     let failedTestFiles = [];
+    let doNotRetry = false;
     for (const testFile of testFiles) {
         const success = await buildAndTest(testFile, browser, false);
         if (!success) {
             failedTestFiles.push(testFile);
-            if (utils_1.cliConfig.bail) {
+            if (!isFlaky()) {
+                doNotRetry = true;
+            }
+            if (utils_1.cliOptions.bail) {
                 return failedTestFiles;
             }
         }
     }
+    if (doNotRetry) {
+        return failedTestFiles;
+    }
     if (!(0, utils_1.isCI)()) {
         return failedTestFiles;
     }
-    // Second & third attempt
-    for (let n = 1; n <= 2; n++) {
-        for (const testFile of failedTestFiles) {
-            const success = await buildAndTest(testFile, browser, true);
-            if (success) {
-                failedTestFiles = failedTestFiles.filter((t) => t !== testFile);
+    else {
+        // Second & third attempt
+        for (let i = 0; i <= 1; i++) {
+            console.log((i === 0 ? 'SECOND' : 'THIRD') + '_ATTEMPT');
+            for (const testFile of failedTestFiles) {
+                const success = await buildAndTest(testFile, browser, i === 1);
+                if (success) {
+                    failedTestFiles = failedTestFiles.filter((t) => t !== testFile);
+                }
             }
         }
+        return failedTestFiles;
     }
-    return failedTestFiles;
 }
-async function buildAndTest(testFile, browser, isSecondAttempt) {
+function isFlaky() {
+    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
+    // Set when user calls run()
+    (0, utils_1.assert)(testInfo.runInfo);
+    return testInfo.runInfo.isFlaky;
+}
+async function buildAndTest(testFile, browser, isThirdAttempt) {
     (0, utils_1.assert)(testFile.endsWith('.ts'));
     const testFileJs = testFile.replace('.ts', '.mjs');
     (0, utils_1.assert)(testFileJs.endsWith('.mjs'));
@@ -100,22 +115,15 @@ async function buildAndTest(testFile, browser, isSecondAttempt) {
         (0, logTestStatus_1.logPass)();
         return true;
     }
-    const success = await runServerAndTests(browser, isSecondAttempt);
+    const success = await runServerAndTests(browser, isThirdAttempt);
     (0, getCurrentTest_2.setCurrentTest)(null);
     return success;
 }
-async function runServerAndTests(browser, isSecondAttempt) {
+async function runServerAndTests(browser, isThirdAttempt) {
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
-    // Set when user calls run()
-    (0, utils_1.assert)(testInfo.runInfo);
     (0, utils_1.assert)(testInfo.startServer);
     (0, utils_1.assert)(testInfo.terminateServer);
-    const isFinalAttempt = isSecondAttempt || !testInfo.runInfo.isFlaky;
-    const abortMaybe = () => {
-        if (isFinalAttempt && (0, parallel_ci_1.isParallelCI)()) {
-            process.exit(1);
-        }
-    };
+    const isFinalAttempt = isThirdAttempt || !isFlaky();
     const page = await browser.newPage();
     testInfo.page = page;
     try {
@@ -123,7 +131,6 @@ async function runServerAndTests(browser, isSecondAttempt) {
     }
     catch (err) {
         logFailure(err, 'an error occurred while starting the server', isFinalAttempt);
-        abortMaybe();
         return false;
     }
     let success = await runTests(testInfo, isFinalAttempt);
@@ -142,14 +149,11 @@ async function runServerAndTests(browser, isSecondAttempt) {
     if (success) {
         (0, logTestStatus_1.logPass)();
     }
-    else {
-        abortMaybe();
-    }
     Logs_1.Logs.clearLogs();
     return success;
 }
 async function runTests(testInfo, isFinalAttempt) {
-    // Set when user calls `run()`
+    // Set when user calls run()
     (0, utils_1.assert)(testInfo.runInfo);
     (0, utils_1.assert)(testInfo.afterEach);
     const tests = 

package/dist/utils/{cliConfig.d.ts → cliOptions.d.ts}

@@ -1,5 +1,5 @@
-export { cliConfig };
-declare const cliConfig: {
+export { cliOptions };
+declare const cliOptions: {
     verbose: boolean;
     inspect: boolean;
     debugEsbuild: boolean;

package/dist/utils/{cliConfig.js → cliOptions.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cliConfig = void 0;
+exports.cliOptions = void 0;
 const parseCli_1 = require("./parseCli");
 (0, parseCli_1.prepare)();
 const verbose = (0, parseCli_1.check)('--verbose');
@@ -12,11 +12,11 @@ const bail = (0, parseCli_1.check)('--bail');
 const exclude = check('--exclude')
 */
 (0, parseCli_1.validate)();
-const cliConfig = {
+const cliOptions = {
     verbose,
     // To inspect a specific test: `$ touch examples/some-example/INSPECT`
     inspect: inspect || !!process.env.TEST_INSPECT,
     debugEsbuild,
-    bail
+    bail,
 };
-exports.cliConfig = cliConfig;
+exports.cliOptions = cliOptions;

package/dist/utils/index.d.ts

@@ -7,7 +7,7 @@ export * from './humanizeTime';
 export * from './isTTY';
 export * from './findFiles';
 export * from './logProgress';
-export * from './cliConfig';
+export * from './cliOptions';
 export * from './fsWindowsBugWorkaround';
 export * from './isObject';
 export * from './isCallable';

package/dist/utils/index.js

@@ -23,7 +23,7 @@ __exportStar(require("./humanizeTime"), exports);
 __exportStar(require("./isTTY"), exports);
 __exportStar(require("./findFiles"), exports);
 __exportStar(require("./logProgress"), exports);
-__exportStar(require("./cliConfig"), exports);
+__exportStar(require("./cliOptions"), exports);
 __exportStar(require("./fsWindowsBugWorkaround"), exports);
 __exportStar(require("./isObject"), exports);
 __exportStar(require("./isCallable"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/test-e2e",
-  "version": "0.5.17",
+  "version": "0.5.19",
   "bin": "./bin.js",
   "main": "./dist/index.js",
   "scripts": {