zarro 1.149.0 → 1.150.0

package/gulp-tasks/modules/env.js

@@ -386,7 +386,6 @@
     const positiveFlags = ["yes", "true", "1"];
     const negativeFlags = ["no", "false", "0"];
     function resolveFlag(name, fallback) {
-        debugger;
         const resolved = resolveInternal(name), value = resolved === undefined || resolved === ""
             ? undefined
             : resolved.toLowerCase();

package/gulp-tasks/modules/register-environment-variables.js

@@ -48,6 +48,11 @@
             default: "false",
             help: "run your dotnet core tests in parallel - will be automatically enabled if not set and the quackers logger is used"
         });
+        env.register({
+            name: "DOTNET_TEST_REBUILD",
+            default: "false",
+            help: "force project rebuild before testing - useful if you don't have a full pipeline that includes an initial build (eg when using test-dotnet-logic manually"
+        });
         env.register({
             name: "DOTNET_PARALLEL_STAGGER_MS",
             default: "1000",

package/gulp-tasks/modules/test-dotnet-logic.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 (function () {
-    const QUACKERS_LOG_PREFIX = ":quackers_log:", QUACKERS_SUMMARY_START_MARKER = `::start_summary::`, QUACKERS_SUMMARY_COMPLETE_MARKER = `::summary_complete::`, QUACKERS_FAILURE_START_MARKER = `::start_failures::`, QUACKERS_FAILURE_INDEX_PLACEHOLDER = "::[#]::", QUACKERS_SLOW_INDEX_PLACEHOLDER = "::[-]::", QUACKERS_SLOW_SUMMARY_START_MARKER = "::slow_summary_start::", QUACKERS_SLOW_SUMMARY_COMPLETE_MARKER = "::slow_summary_complete::", QUACKERS_VERBOSE_SUMMARY = "true", QUACKERS_OUTPUT_FAILURES_INLINE = "true", quackersLogPrefixLength = QUACKERS_LOG_PREFIX.length, quackersFullSummaryStartMarker = `${QUACKERS_LOG_PREFIX}${QUACKERS_SUMMARY_START_MARKER}`, quackersFullSummaryCompleteMarker = `${QUACKERS_LOG_PREFIX}${QUACKERS_SUMMARY_COMPLETE_MARKER}`, { rm, ls, FsEntities, readTextFile, mkdir } = require("yafs"), gulp = requireModule("gulp"), log = requireModule("log"), path = require("path"), gulpDebug = require("gulp-debug"), debug = requireModule("debug")(__filename), filter = require("gulp-filter"), ansiColors = requireModule("ansi-colors"), promisifyStream = requireModule("promisify-stream"), nunitRunner = requireModule("gulp-nunit-runner"), testUtilFinder = requireModule("testutil-finder"), env = requireModule("env"), resolveTestMasks = requireModule("resolve-test-masks"), logConfig = requireModule("log-config"), gatherPaths = requireModule("gather-paths"), { test } = requireModule("dotnet-cli"), { resolveTestPrefixFor } = requireModule("test-utils"), buildReportFolder = path.dirname(env.resolve("BUILD_REPORT_XML")), Version = requireModule("version"), quote = requireModule("quote-if-required"), netFrameworkTestAssemblyFilter = requireModule("netfx-test-assembly-filter"), { baseName, chopExtension } = requireModule("path-utils");
+    const QUACKERS_LOG_PREFIX = ":quackers_log:", QUACKERS_SUMMARY_START_MARKER = `::start_summary::`, QUACKERS_SUMMARY_COMPLETE_MARKER = `::summary_complete::`, QUACKERS_FAILURE_START_MARKER = `::start_failures::`, QUACKERS_FAILURE_INDEX_PLACEHOLDER = "::[#]::", QUACKERS_SLOW_INDEX_PLACEHOLDER = "::[-]::", QUACKERS_SLOW_SUMMARY_START_MARKER = "::slow_summary_start::", QUACKERS_SLOW_SUMMARY_COMPLETE_MARKER = "::slow_summary_complete::", QUACKERS_SHOW_SUMMARY = "true", QUACKERS_SUMMARY_TOTALS_START_MARKER = "::totals_summary_start::", QUACKERS_SUMMARY_TOTALS_COMPLETE_MARKER = "::totals_summary_complete::", QUACKERS_OUTPUT_FAILURES_INLINE = "true", quackersLogPrefixLength = QUACKERS_LOG_PREFIX.length, quackersFullSummaryStartMarker = `${QUACKERS_LOG_PREFIX}${QUACKERS_SUMMARY_START_MARKER}`, quackersFullSummaryCompleteMarker = `${QUACKERS_LOG_PREFIX}${QUACKERS_SUMMARY_COMPLETE_MARKER}`, { rm, ls, FsEntities, readTextFile, mkdir } = require("yafs"), gulp = requireModule("gulp"), log = requireModule("log"), path = require("path"), gulpDebug = require("gulp-debug"), debug = requireModule("debug")(__filename), filter = require("gulp-filter"), ansiColors = requireModule("ansi-colors"), promisifyStream = requireModule("promisify-stream"), nunitRunner = requireModule("gulp-nunit-runner"), testUtilFinder = requireModule("testutil-finder"), env = requireModule("env"), resolveTestMasks = requireModule("resolve-test-masks"), logConfig = requireModule("log-config"), gatherPaths = requireModule("gather-paths"), { test } = requireModule("dotnet-cli"), { resolveTestPrefixFor } = requireModule("test-utils"), buildReportFolder = path.dirname(env.resolve("BUILD_REPORT_XML")), Version = requireModule("version"), quote = requireModule("quote-if-required"), netFrameworkTestAssemblyFilter = requireModule("netfx-test-assembly-filter"), { baseName, chopExtension } = requireModule("path-utils");
     async function runTests() {
         await mkdir(buildReportFolder);
         const dotNetCore = env.resolveFlag("DOTNET_CORE");
@@ -159,7 +159,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
             failureSummary: [],
             slowSummary: [],
             started: Date.now(),
-            fullLog: []
+            fullLog: [],
         }, testProcessResults = [], testProjectPaths = await gatherPaths(testProjects, true), verbosity = env.resolve("BUILD_VERBOSITY");
         const testInParallel = await shouldTestInParallel(testProjectPaths);
         const concurrency = testInParallel
@@ -169,11 +169,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
         for (const projectPath of testProjectPaths) {
             console.log(`  ${projectPath}`);
         }
+        const rebuild = env.resolveFlag(env.DOTNET_TEST_REBUILD);
+        const runningInParallel = concurrency > 1;
         const tasks = testProjectPaths.map((path, idx) => {
             return async () => {
                 debug(`${idx}  start test run ${path}`);
-                const result = await testOneDotNetCoreProject(path, configuration, verbosity, testResults, true);
-                testProcessResults.push(result);
+                try {
+                    const result = await testOneDotNetCoreProject(path, configuration, verbosity, testResults, runningInParallel, rebuild);
+                    testProcessResults.push(result);
+                }
+                catch (e) {
+                    console.error(`unable to test dotnet core project '${path}':\n${e}`);
+                    process.exit(1);
+                }
             };
         });
         await runInParallel(concurrency, ...tasks);
@@ -236,13 +244,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
             : ansiColors.yellowBright.bind(ansiColors);
         logFailures(testResults, red);
         logSlow(testResults, cyan);
-        console.log(yellow(`
-Test Run Summary
-  Overall result: ${overallResultFor(testResults)}
-  Test Count: ${total}, Passed: ${testResults.passed}, Failed: ${testResults.failed}, Skipped: ${testResults.skipped}, Slow: ${testResults.slowSummary.length}
-  Start time: ${dateString(testResults.started)}
-    End time: ${dateString(now)}
-    Duration: ${runTime}
+        console.log(yellow(`
+Test Run Summary
+  Overall result: ${overallResultFor(testResults)}
+  Test Count: ${total}
+    Passed: ${testResults.passed} 
+    Failed: ${testResults.failed}
+    Skipped: ${testResults.skipped}
+    Slow: ${testResults.slowSummary.length}
+  Start time: ${dateString(testResults.started)}
+    End time: ${dateString(now)}
+    Duration: ${runTime}
 `));
         console.log("\n");
     }
@@ -297,6 +309,7 @@ Test Run Summary
             inSummary: false,
             inFailureSummary: false,
             inSlowSummary: false,
+            inTotalsSummary: false,
             // there is some valid logging (eg build) before the first quackers log
             // -> suppress when running in parallel (and by default when sequential)
             haveSeenQuackersLog: runningInParallel || env.resolveFlag("DOTNET_TEST_QUIET_QUACKERS"),
@@ -314,7 +327,8 @@ Test Run Summary
             ? "quiet" // if quackers is providing details, quieten down the built-in console logger
             : verbosity;
         await mkdir(buildReportFolder);
-        addTrxLoggerTo(loggers, target);
+        // FIXME: re-enable once totals tests are passing
+        // addTrxLoggerTo(loggers, target);
         testResults.quackersEnabled = testResults.quackersEnabled || useQuackers;
         try {
             const result = await test({
@@ -349,113 +363,120 @@ Test Run Summary
         console.error(s);
     }
     function quackersStdOutHandler(state, s) {
-        s = s || "";
-        if (s.includes("\n")) {
-            const lines = s.split("\n").map(s => s.trimEnd());
-            for (const line of lines) {
-                quackersStdOutHandler(state, line);
-            }
-            return;
-        }
-        state.fullLog.push(s);
-        debug(`[test stdout] ${s}`);
-        if (s.startsWith(quackersFullSummaryStartMarker)) {
-            debug("  summary starts");
-            state.inSummary = true;
-            return;
-        }
-        if (s.startsWith(quackersFullSummaryCompleteMarker)) {
-            debug("  summary ends");
-            state.inSummary = false;
-            return;
-        }
-        if (state.inSummary) {
-            const hasQuackersPrefix = s.startsWith(QUACKERS_LOG_PREFIX);
-            if (s.match(/overall/i)) {
-                console.log({
-                    state,
-                    isQuackersLog: hasQuackersPrefix
-                });
-            }
-            /* actual summary log example, using settings
-      
-          QUACKERS_LOG_PREFIX = "::",
-          QUACKERS_SUMMARY_START_MARKER = `::SS::`,
-          QUACKERS_SUMMARY_COMPLETE_MARKER = `::SC::`,
-          QUACKERS_FAILURE_START_MARKER = `::SF::`,
-          QUACKERS_FAILURE_INDEX_PLACEHOLDER = "::[#]::",
-          QUACKERS_SLOW_INDEX_PLACEHOLDER = "::[-]::",
-          QUACKERS_SLOW_SUMMARY_START_MARKER = "::SSS::",
-          QUACKERS_SLOW_SUMMARY_COMPLETE_MARKER = "::SSC::",
-          QUACKERS_VERBOSE_SUMMARY = "true",
-          QUACKERS_OUTPUT_FAILURES_INLINE = "true",
-      
-        ::::SS::
-        ::::SSS::
-        :: {some slow summary data}
-        ::::SSC::
-        ::
-        ::
-        ::Test results:
-        ::Passed:  8
-        ::Failed:  2
-        ::Skipped: 1
-        ::Total:   11
-      
-        ::Failures:
-      
-        ::[1] QuackersTestHost.SomeTests.ShouldBeLessThan50(75)
-        ::  NExpect.Exceptions.UnmetExpectationException : Expected 75 to be less than 50
-        ::     at QuackersTestHost.SomeTests.ShouldBeLessThan50(Int32 value) in C:\code\opensource\quackers\src\Demo\SomeTests.cs:line 66
-        ::
-      
-        ::[2] QuackersTestHost.SomeTests.ShouldFail
-        ::  NExpect.Exceptions.UnmetExpectationException : Expected false but got true
-        ::     at QuackersTestHost.SomeTests.ShouldFail() in C:\code\opensource\quackers\src\Demo\SomeTests.cs:line 28
-        ::
-        ::::SC::
-             */
-            const line = stripQuackersLogPrefix(s);
-            if (line.startsWith(QUACKERS_FAILURE_START_MARKER)) {
-                debug("failure summary start");
-                state.inFailureSummary = true;
+        try {
+            s = s || "";
+            if (s.includes("\n")) {
+                const lines = s.split("\n").map(s => s.trimEnd());
+                for (const line of lines) {
+                    quackersStdOutHandler(state, line);
+                }
                 return;
             }
-            if (line.startsWith(QUACKERS_SLOW_SUMMARY_START_MARKER)) {
-                debug("slow summary start");
-                state.inSlowSummary = true;
+            state.fullLog.push(s);
+            debug(`[test stdout] ${s}`);
+            if (s.startsWith(quackersFullSummaryStartMarker)) {
+                debug("  summary starts");
+                state.inSummary = true;
                 return;
             }
-            if (line.startsWith(QUACKERS_SLOW_SUMMARY_COMPLETE_MARKER)) {
-                debug("slow summary complete");
-                state.inSlowSummary = false;
+            if (s.startsWith(quackersFullSummaryCompleteMarker)) {
+                debug("  summary ends");
+                state.inSummary = false;
                 return;
             }
-            if (state.inFailureSummary) {
-                state.testResults.failureSummary.push(line);
+            if (state.inSummary) {
+                /* actual summary log example, using settings
+          
+              QUACKERS_LOG_PREFIX = "::",
+              QUACKERS_SUMMARY_START_MARKER = `::SS::`,
+              QUACKERS_SUMMARY_COMPLETE_MARKER = `::SC::`,
+              QUACKERS_FAILURE_START_MARKER = `::SF::`,
+              QUACKERS_FAILURE_INDEX_PLACEHOLDER = "::[#]::",
+              QUACKERS_SLOW_INDEX_PLACEHOLDER = "::[-]::",
+              QUACKERS_SLOW_SUMMARY_START_MARKER = "::SSS::",
+              QUACKERS_SLOW_SUMMARY_COMPLETE_MARKER = "::SSC::",
+              QUACKERS_VERBOSE_SUMMARY = "true",
+              QUACKERS_OUTPUT_FAILURES_INLINE = "true",
+          
+            ::::SS::
+            ::::SSS::
+            :: {some slow summary data}
+            ::::SSC::
+            ::
+            ::
+            ::Test results:
+            ::Passed:  8
+            ::Failed:  2
+            ::Skipped: 1
+            ::Total:   11
+          
+            ::Failures:
+          
+            ::[1] QuackersTestHost.SomeTests.ShouldBeLessThan50(75)
+            ::  NExpect.Exceptions.UnmetExpectationException : Expected 75 to be less than 50
+            ::     at QuackersTestHost.SomeTests.ShouldBeLessThan50(Int32 value) in C:\code\opensource\quackers\src\Demo\SomeTests.cs:line 66
+            ::
+          
+            ::[2] QuackersTestHost.SomeTests.ShouldFail
+            ::  NExpect.Exceptions.UnmetExpectationException : Expected false but got true
+            ::     at QuackersTestHost.SomeTests.ShouldFail() in C:\code\opensource\quackers\src\Demo\SomeTests.cs:line 28
+            ::
+            ::::SC::
+                 */
+                const line = stripQuackersLogPrefix(s);
+                if (line.startsWith(QUACKERS_FAILURE_START_MARKER)) {
+                    debug("failure summary start");
+                    state.inFailureSummary = true;
+                    return;
+                }
+                if (line.startsWith(QUACKERS_SLOW_SUMMARY_START_MARKER)) {
+                    debug("slow summary start");
+                    state.inSlowSummary = true;
+                    return;
+                }
+                if (line.startsWith(QUACKERS_SLOW_SUMMARY_COMPLETE_MARKER)) {
+                    debug("slow summary complete");
+                    state.inSlowSummary = false;
+                    return;
+                }
+                if (line.startsWith(QUACKERS_SUMMARY_TOTALS_START_MARKER)) {
+                    debug("totals summary start");
+                    state.inTotalsSummary = true;
+                    return;
+                }
+                if (line.startsWith(QUACKERS_SUMMARY_TOTALS_COMPLETE_MARKER)) {
+                    debug("totals summary complete");
+                    state.inTotalsSummary = false;
+                    return;
+                }
+                if (state.inTotalsSummary) {
+                    incrementTestResultCount(state.testResults, line);
+                    return;
+                }
+                if (state.inFailureSummary) {
+                    state.testResults.failureSummary.push(line);
+                    return;
+                }
+                if (state.inSlowSummary) {
+                    state.testResults.slowSummary.push(line);
+                    return;
+                }
                 return;
             }
-            if (state.inSlowSummary) {
-                state.testResults.slowSummary.push(line);
+            const isQuackersLog = s.startsWith(QUACKERS_LOG_PREFIX);
+            if (isQuackersLog) {
+                state.haveSeenQuackersLog = true;
+            }
+            if (!state.haveSeenQuackersLog || isQuackersLog) {
+                console.log(stripQuackersLogPrefix(s));
+            }
+            else {
+                debug(`discarding log: "${s}"`);
             }
-            incrementTestResultCount(state.testResults, line);
-            return;
-        }
-        const isQuackersLog = s.startsWith(QUACKERS_LOG_PREFIX);
-        if (s.match(/overall/i)) {
-            console.log({
-                state,
-                isQuackersLog
-            });
-        }
-        if (isQuackersLog) {
-            state.haveSeenQuackersLog = true;
-        }
-        if (!state.haveSeenQuackersLog || isQuackersLog) {
-            console.log(stripQuackersLogPrefix(s));
         }
-        else {
-            debug(`discarding log: "${s}"`);
+        catch (e) {
+            const err = e;
+            const err2 = err;
         }
     }
     function incrementTestResultCount(testResults, line) {
@@ -512,10 +533,12 @@ Test Run Summary
             QUACKERS_FAILURE_START_MARKER,
             QUACKERS_SLOW_SUMMARY_START_MARKER,
             QUACKERS_SLOW_SUMMARY_COMPLETE_MARKER,
-            QUACKERS_VERBOSE_SUMMARY,
+            QUACKERS_VERBOSE_SUMMARY: QUACKERS_SHOW_SUMMARY,
             QUACKERS_OUTPUT_FAILURES_INLINE,
             QUACKERS_FAILURE_INDEX_PLACEHOLDER,
-            QUACKERS_SLOW_INDEX_PLACEHOLDER
+            QUACKERS_SLOW_INDEX_PLACEHOLDER,
+            QUACKERS_SUMMARY_TOTALS_START_MARKER,
+            QUACKERS_SUMMARY_TOTALS_COMPLETE_MARKER
         };
         if (prefix) {
             quackersVars.QUACKERS_TEST_NAME_PREFIX = prefix;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.149.0",
+  "version": "1.150.0",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"
@@ -22,7 +22,7 @@
     "autotest-full-once": "run-s clear-console build test",
     "autotest-full": "nodemon -w gulp-tasks -w tests -w types.d.ts -x \"npm run autotest-full-once || cd .\" -e ts",
     "preautobuild": "run-s build-fetch-github-release",
-    "autobuild": "tsc --watch --incremental",
+    "autobuild": "nodemon -w gulp-tasks/**/*.ts -i gulp-tasks/modules/fetch-github-release -w tests/**/*.ts -w types.d.ts -x \"npm run build || cd .\" -e ts",
     "prestart": "run-s build",
     "start": "node index.js",
     "zarro": "node index.js",
@@ -119,9 +119,11 @@
     "debugger-is-attached": "^1.2.0",
     "expect-even-more-jest": "^1.15.0",
     "filesystem-sandbox": "^1.20.0",
+    "ioredis": "^5.3.2",
     "jest": "^29.6.2",
     "nodemon": "^3.0.1",
     "proxyquire": "^2.1.3",
+    "redlock": "^5.0.0-beta.2",
     "ts-jest": "^29.1.1",
     "typescript": "^5.1.6",
     "yargs": "^16.2.0"

package/types.d.ts

@@ -471,6 +471,7 @@ declare global {
     "BUILD_FAIL_ON_ERROR" |
     "BUILD_MSBUILD_NODE_REUSE" |
     "DOTNET_TEST_PARALLEL" |
+    "DOTNET_TEST_REBUILD" |
     "DOTNET_CORE" |
     "DRY_RUN" |
     "ENFORCE_VERIFICATION" |
@@ -644,6 +645,7 @@ declare global {
     BUILD_FAIL_ON_ERROR: FlagEnvVar;
     BUILD_MSBUILD_NODE_REUSE: FlagEnvVar;
     DOTNET_TEST_PARALLEL: FlagEnvVar;
+    DOTNET_TEST_REBUILD: FlagEnvVar;
     DOTNET_CORE: FlagEnvVar;
     DRY_RUN: FlagEnvVar;
     ENFORCE_VERIFICATION: FlagEnvVar;