From 9d23ce3d0677167672ade174a846cc7373c93643 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 21 Jun 2019 14:49:43 -0700 Subject: [PATCH] Sanitize rush progress numbers in docker test output (#32029) --- src/testRunner/externalCompileRunner.ts | 6 +- .../baselines/reference/docker/azure-sdk.log | 36 ++++---- .../reference/docker/office-ui-fabric.log | 82 +++++++++---------- 3 files changed, 64 insertions(+), 60 deletions(-) diff --git a/src/testRunner/externalCompileRunner.ts b/src/testRunner/externalCompileRunner.ts index e40f8115e5..4e1575ca47 100644 --- a/src/testRunner/externalCompileRunner.ts +++ b/src/testRunner/externalCompileRunner.ts @@ -157,7 +157,7 @@ ${sanitizeDockerfileOutput(result.stderr.toString())}`; } function sanitizeDockerfileOutput(result: string): string { - return stripAbsoluteImportPaths(sanitizeTimestamps(stripANSIEscapes(normalizeNewlines(result)))); + return stripAbsoluteImportPaths(sanitizeTimestamps(stripRushStageNumbers(stripANSIEscapes(normalizeNewlines(result))))); } function normalizeNewlines(result: string): string { @@ -168,6 +168,10 @@ function stripANSIEscapes(result: string): string { return result.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, ""); } +function stripRushStageNumbers(result: string): string { + return result.replace(/\d+ of \d+:/g, "XX of XX:"); +} + function sanitizeTimestamps(result: string): string { return result.replace(/\[\d?\d:\d\d:\d\d (A|P)M\]/g, "[XX:XX:XX XM]") .replace(/\d+(\.\d+)? seconds?/g, "? seconds") diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log index 3d2374b154..e89b970b00 100644 --- a/tests/baselines/reference/docker/azure-sdk.log +++ b/tests/baselines/reference/docker/azure-sdk.log @@ -10,40 +10,40 @@ Starting "rush rebuild" Executing a maximum of 1 simultaneous processes... [@azure/abort-controller] started -1 of 18: [@azure/abort-controller] completed successfully in ? seconds +XX of XX: [@azure/abort-controller] completed successfully in ? seconds [@azure/cosmos] started -2 of 18: [@azure/cosmos] completed successfully in ? seconds +XX of XX: [@azure/cosmos] completed successfully in ? seconds [@azure/event-hubs] started -3 of 18: [@azure/event-hubs] completed successfully in ? seconds +XX of XX: [@azure/event-hubs] completed successfully in ? seconds [@azure/service-bus] started Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md [@azure/storage-blob] started -5 of 18: [@azure/storage-blob] completed successfully in ? seconds +XX of XX: [@azure/storage-blob] completed successfully in ? seconds [@azure/storage-datalake] started -6 of 18: [@azure/storage-datalake] completed successfully in ? seconds +XX of XX: [@azure/storage-datalake] completed successfully in ? seconds [@azure/storage-file] started -7 of 18: [@azure/storage-file] completed successfully in ? seconds +XX of XX: [@azure/storage-file] completed successfully in ? seconds [@azure/storage-queue] started -8 of 18: [@azure/storage-queue] completed successfully in ? seconds +XX of XX: [@azure/storage-queue] completed successfully in ? seconds [@azure/template] started -9 of 18: [@azure/template] completed successfully in ? seconds +XX of XX: [@azure/template] completed successfully in ? seconds [@azure/core-http] started -10 of 18: [@azure/core-http] completed successfully in ? seconds +XX of XX: [@azure/core-http] completed successfully in ? seconds [@azure/core-paging] started -11 of 18: [@azure/core-paging] completed successfully in ? seconds +XX of XX: [@azure/core-paging] completed successfully in ? seconds [@azure/event-processor-host] started -12 of 18: [@azure/event-processor-host] completed successfully in ? seconds +XX of XX: [@azure/event-processor-host] completed successfully in ? seconds [testhub] started -13 of 18: [testhub] completed successfully in ? seconds +XX of XX: [testhub] completed successfully in ? seconds [@azure/identity] started -14 of 18: [@azure/identity] completed successfully in ? seconds +XX of XX: [@azure/identity] completed successfully in ? seconds [@azure/core-amqp] started [@azure/keyvault-certificates] started -15 of 18: [@azure/keyvault-certificates] completed successfully in ? seconds +XX of XX: [@azure/keyvault-certificates] completed successfully in ? seconds [@azure/keyvault-keys] started -16 of 18: [@azure/keyvault-keys] completed successfully in ? seconds +XX of XX: [@azure/keyvault-keys] completed successfully in ? seconds [@azure/keyvault-secrets] started -17 of 18: [@azure/keyvault-secrets] completed successfully in ? seconds +XX of XX: [@azure/keyvault-secrets] completed successfully in ? seconds SUCCESS (16) ================================ @@ -89,7 +89,7 @@ rush rebuild - Errors! ( ? seconds) Standard error: Your version of Node.js (12.4.0) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js. -4 of 18: [@azure/service-bus] completed with warnings in ? seconds +XX of XX: [@azure/service-bus] completed with warnings in ? seconds -14 of 18: [@azure/core-amqp] failed to build! +XX of XX: [@azure/core-amqp] failed to build! [@azure/core-amqp] Returned error code: 2 diff --git a/tests/baselines/reference/docker/office-ui-fabric.log b/tests/baselines/reference/docker/office-ui-fabric.log index 7107d8f3bc..536a28f114 100644 --- a/tests/baselines/reference/docker/office-ui-fabric.log +++ b/tests/baselines/reference/docker/office-ui-fabric.log @@ -10,15 +10,15 @@ Starting "rush rebuild" Executing a maximum of 1 simultaneous processes... [@uifabric/prettier-rules] started -1 of 41: [@uifabric/prettier-rules] completed successfully in ? seconds +XX of XX: [@uifabric/prettier-rules] completed successfully in ? seconds [@uifabric/tslint-rules] started -2 of 41: [@uifabric/tslint-rules] completed successfully in ? seconds +XX of XX: [@uifabric/tslint-rules] completed successfully in ? seconds [@uifabric/codepen-loader] started ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. [@uifabric/build] started -4 of 41: [@uifabric/build] completed successfully in ? seconds +XX of XX: [@uifabric/build] completed successfully in ? seconds [@uifabric/migration] started -5 of 41: [@uifabric/migration] completed successfully in ? seconds +XX of XX: [@uifabric/migration] completed successfully in ? seconds [@uifabric/set-version] started ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. [@uifabric/merge-styles] started @@ -26,13 +26,13 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed [@uifabric/jest-serializer-merge-styles] started ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. [@uifabric/test-utilities] started -9 of 41: [@uifabric/test-utilities] completed successfully in ? seconds +XX of XX: [@uifabric/test-utilities] completed successfully in ? seconds [@uifabric/utilities] started ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. [@uifabric/styling] started ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. [@uifabric/file-type-icons] started -12 of 41: [@uifabric/file-type-icons] completed successfully in ? seconds +XX of XX: [@uifabric/file-type-icons] completed successfully in ? seconds [@uifabric/foundation] started ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. ● createFactory › passes componentProps without userProps @@ -270,9 +270,9 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed [XX:XX:XX XM] x finished 'build' in ?s with errors [XX:XX:XX XM] x Error previously detected. See above for error messages. [@uifabric/icons] started -39 of 41: [@uifabric/icons] completed successfully in ? seconds +XX of XX: [@uifabric/icons] completed successfully in ? seconds [@uifabric/webpack-utils] started -40 of 41: [@uifabric/webpack-utils] completed successfully in ? seconds +XX of XX: [@uifabric/webpack-utils] completed successfully in ? seconds SUCCESS (8) ================================ @@ -381,38 +381,38 @@ rush rebuild - Errors! ( ? seconds) Standard error: Your version of Node.js (12.4.0) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js. -3 of 41: [@uifabric/codepen-loader] completed with warnings in ? seconds -6 of 41: [@uifabric/set-version] completed with warnings in ? seconds -7 of 41: [@uifabric/merge-styles] completed with warnings in ? seconds -8 of 41: [@uifabric/jest-serializer-merge-styles] completed with warnings in ? seconds -10 of 41: [@uifabric/utilities] completed with warnings in ? seconds -11 of 41: [@uifabric/styling] completed with warnings in ? seconds +XX of XX: [@uifabric/codepen-loader] completed with warnings in ? seconds +XX of XX: [@uifabric/set-version] completed with warnings in ? seconds +XX of XX: [@uifabric/merge-styles] completed with warnings in ? seconds +XX of XX: [@uifabric/jest-serializer-merge-styles] completed with warnings in ? seconds +XX of XX: [@uifabric/utilities] completed with warnings in ? seconds +XX of XX: [@uifabric/styling] completed with warnings in ? seconds -12 of 41: [@uifabric/foundation] failed to build! -13 of 41: [@uifabric/experiments] blocked by [@uifabric/foundation]! -14 of 41: [@uifabric/fabric-website] blocked by [@uifabric/foundation]! -15 of 41: [@uifabric/pr-deploy-site] blocked by [@uifabric/foundation]! -16 of 41: [@uifabric/react-cards] blocked by [@uifabric/foundation]! -17 of 41: [theming-designer] blocked by [@uifabric/foundation]! -18 of 41: [vr-tests] blocked by [@uifabric/foundation]! -19 of 41: [dom-tests] blocked by [@uifabric/foundation]! -20 of 41: [perf-test] blocked by [@uifabric/foundation]! -21 of 41: [test-bundles] blocked by [@uifabric/foundation]! -22 of 41: [office-ui-fabric-react] blocked by [@uifabric/foundation]! -23 of 41: [@uifabric/api-docs] blocked by [@uifabric/foundation]! -24 of 41: [@uifabric/fabric-website-resources] blocked by [@uifabric/foundation]! -25 of 41: [a11y-tests] blocked by [@uifabric/foundation]! -26 of 41: [ssr-tests] blocked by [@uifabric/foundation]! -27 of 41: [@uifabric/azure-themes] blocked by [@uifabric/foundation]! -28 of 41: [@uifabric/charting] blocked by [@uifabric/foundation]! -29 of 41: [@uifabric/date-time] blocked by [@uifabric/foundation]! -30 of 41: [@uifabric/example-app-base] blocked by [@uifabric/foundation]! -31 of 41: [@uifabric/foundation-scenarios] blocked by [@uifabric/foundation]! -32 of 41: [@uifabric/lists] blocked by [@uifabric/foundation]! -33 of 41: [@uifabric/fluent-theme] blocked by [@uifabric/foundation]! -34 of 41: [@uifabric/tsx-editor] blocked by [@uifabric/foundation]! -35 of 41: [@uifabric/theme-samples] blocked by [@uifabric/foundation]! -36 of 41: [@uifabric/variants] blocked by [@uifabric/foundation]! -37 of 41: [server-rendered-app] blocked by [@uifabric/foundation]! -38 of 41: [todo-app] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/foundation] failed to build! +XX of XX: [@uifabric/experiments] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/fabric-website] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/pr-deploy-site] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/react-cards] blocked by [@uifabric/foundation]! +XX of XX: [theming-designer] blocked by [@uifabric/foundation]! +XX of XX: [vr-tests] blocked by [@uifabric/foundation]! +XX of XX: [dom-tests] blocked by [@uifabric/foundation]! +XX of XX: [perf-test] blocked by [@uifabric/foundation]! +XX of XX: [test-bundles] blocked by [@uifabric/foundation]! +XX of XX: [office-ui-fabric-react] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/api-docs] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/fabric-website-resources] blocked by [@uifabric/foundation]! +XX of XX: [a11y-tests] blocked by [@uifabric/foundation]! +XX of XX: [ssr-tests] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/azure-themes] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/charting] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/date-time] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/example-app-base] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/foundation-scenarios] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/lists] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/fluent-theme] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/tsx-editor] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/theme-samples] blocked by [@uifabric/foundation]! +XX of XX: [@uifabric/variants] blocked by [@uifabric/foundation]! +XX of XX: [server-rendered-app] blocked by [@uifabric/foundation]! +XX of XX: [todo-app] blocked by [@uifabric/foundation]! [@uifabric/foundation] Returned error code: 1