Skip to content

Commit 9d23ce3

Browse files
authored
Sanitize rush progress numbers in docker test output (#32029)
1 parent 5498f58 commit 9d23ce3

File tree

3 files changed

+65
-61
lines changed

3 files changed

+65
-61
lines changed

src/testRunner/externalCompileRunner.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ ${sanitizeDockerfileOutput(result.stderr.toString())}`;
157157
}
158158

159159
function sanitizeDockerfileOutput(result: string): string {
160-
return stripAbsoluteImportPaths(sanitizeTimestamps(stripANSIEscapes(normalizeNewlines(result))));
160+
return stripAbsoluteImportPaths(sanitizeTimestamps(stripRushStageNumbers(stripANSIEscapes(normalizeNewlines(result)))));
161161
}
162162

163163
function normalizeNewlines(result: string): string {
@@ -168,6 +168,10 @@ function stripANSIEscapes(result: string): string {
168168
return result.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "");
169169
}
170170

171+
function stripRushStageNumbers(result: string): string {
172+
return result.replace(/\d+ of \d+:/g, "XX of XX:");
173+
}
174+
171175
function sanitizeTimestamps(result: string): string {
172176
return result.replace(/\[\d?\d:\d\d:\d\d (A|P)M\]/g, "[XX:XX:XX XM]")
173177
.replace(/\d+(\.\d+)? seconds?/g, "? seconds")

tests/baselines/reference/docker/azure-sdk.log

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@ Starting "rush rebuild"
1010
Executing a maximum of 1 simultaneous processes...
1111

1212
[@azure/abort-controller] started
13-
1 of 18: [@azure/abort-controller] completed successfully in ? seconds
13+
XX of XX: [@azure/abort-controller] completed successfully in ? seconds
1414
[@azure/cosmos] started
15-
2 of 18: [@azure/cosmos] completed successfully in ? seconds
15+
XX of XX: [@azure/cosmos] completed successfully in ? seconds
1616
[@azure/event-hubs] started
17-
3 of 18: [@azure/event-hubs] completed successfully in ? seconds
17+
XX of XX: [@azure/event-hubs] completed successfully in ? seconds
1818
[@azure/service-bus] started
1919
Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
2020
[@azure/storage-blob] started
21-
5 of 18: [@azure/storage-blob] completed successfully in ? seconds
21+
XX of XX: [@azure/storage-blob] completed successfully in ? seconds
2222
[@azure/storage-datalake] started
23-
6 of 18: [@azure/storage-datalake] completed successfully in ? seconds
23+
XX of XX: [@azure/storage-datalake] completed successfully in ? seconds
2424
[@azure/storage-file] started
25-
7 of 18: [@azure/storage-file] completed successfully in ? seconds
25+
XX of XX: [@azure/storage-file] completed successfully in ? seconds
2626
[@azure/storage-queue] started
27-
8 of 18: [@azure/storage-queue] completed successfully in ? seconds
27+
XX of XX: [@azure/storage-queue] completed successfully in ? seconds
2828
[@azure/template] started
29-
9 of 18: [@azure/template] completed successfully in ? seconds
29+
XX of XX: [@azure/template] completed successfully in ? seconds
3030
[@azure/core-http] started
31-
10 of 18: [@azure/core-http] completed successfully in ? seconds
31+
XX of XX: [@azure/core-http] completed successfully in ? seconds
3232
[@azure/core-paging] started
33-
11 of 18: [@azure/core-paging] completed successfully in ? seconds
33+
XX of XX: [@azure/core-paging] completed successfully in ? seconds
3434
[@azure/event-processor-host] started
35-
12 of 18: [@azure/event-processor-host] completed successfully in ? seconds
35+
XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
3636
[testhub] started
37-
13 of 18: [testhub] completed successfully in ? seconds
37+
XX of XX: [testhub] completed successfully in ? seconds
3838
[@azure/identity] started
39-
14 of 18: [@azure/identity] completed successfully in ? seconds
39+
XX of XX: [@azure/identity] completed successfully in ? seconds
4040
[@azure/core-amqp] started
4141
[@azure/keyvault-certificates] started
42-
15 of 18: [@azure/keyvault-certificates] completed successfully in ? seconds
42+
XX of XX: [@azure/keyvault-certificates] completed successfully in ? seconds
4343
[@azure/keyvault-keys] started
44-
16 of 18: [@azure/keyvault-keys] completed successfully in ? seconds
44+
XX of XX: [@azure/keyvault-keys] completed successfully in ? seconds
4545
[@azure/keyvault-secrets] started
46-
17 of 18: [@azure/keyvault-secrets] completed successfully in ? seconds
46+
XX of XX: [@azure/keyvault-secrets] completed successfully in ? seconds
4747

4848
SUCCESS (16)
4949
================================
@@ -89,7 +89,7 @@ rush rebuild - Errors! ( ? seconds)
8989

9090
Standard error:
9191
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.
92-
4 of 18: [@azure/service-bus] completed with warnings in ? seconds
92+
XX of XX: [@azure/service-bus] completed with warnings in ? seconds
9393

94-
14 of 18: [@azure/core-amqp] failed to build!
94+
XX of XX: [@azure/core-amqp] failed to build!
9595
[@azure/core-amqp] Returned error code: 2

tests/baselines/reference/docker/office-ui-fabric.log

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,29 @@ Starting "rush rebuild"
1010
Executing a maximum of 1 simultaneous processes...
1111

1212
[@uifabric/prettier-rules] started
13-
1 of 41: [@uifabric/prettier-rules] completed successfully in ? seconds
13+
XX of XX: [@uifabric/prettier-rules] completed successfully in ? seconds
1414
[@uifabric/tslint-rules] started
15-
2 of 41: [@uifabric/tslint-rules] completed successfully in ? seconds
15+
XX of XX: [@uifabric/tslint-rules] completed successfully in ? seconds
1616
[@uifabric/codepen-loader] started
1717
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.
1818
[@uifabric/build] started
19-
4 of 41: [@uifabric/build] completed successfully in ? seconds
19+
XX of XX: [@uifabric/build] completed successfully in ? seconds
2020
[@uifabric/migration] started
21-
5 of 41: [@uifabric/migration] completed successfully in ? seconds
21+
XX of XX: [@uifabric/migration] completed successfully in ? seconds
2222
[@uifabric/set-version] started
2323
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.
2424
[@uifabric/merge-styles] started
2525
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.
2626
[@uifabric/jest-serializer-merge-styles] started
2727
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.
2828
[@uifabric/test-utilities] started
29-
9 of 41: [@uifabric/test-utilities] completed successfully in ? seconds
29+
XX of XX: [@uifabric/test-utilities] completed successfully in ? seconds
3030
[@uifabric/utilities] started
3131
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.
3232
[@uifabric/styling] started
3333
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.
3434
[@uifabric/file-type-icons] started
35-
12 of 41: [@uifabric/file-type-icons] completed successfully in ? seconds
35+
XX of XX: [@uifabric/file-type-icons] completed successfully in ? seconds
3636
[@uifabric/foundation] started
3737
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.
3838
● createFactory › passes componentProps without userProps
@@ -270,9 +270,9 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed
270270
[XX:XX:XX XM] x finished 'build' in ?s with errors
271271
[XX:XX:XX XM] x Error previously detected. See above for error messages.
272272
[@uifabric/icons] started
273-
39 of 41: [@uifabric/icons] completed successfully in ? seconds
273+
XX of XX: [@uifabric/icons] completed successfully in ? seconds
274274
[@uifabric/webpack-utils] started
275-
40 of 41: [@uifabric/webpack-utils] completed successfully in ? seconds
275+
XX of XX: [@uifabric/webpack-utils] completed successfully in ? seconds
276276

277277
SUCCESS (8)
278278
================================
@@ -381,38 +381,38 @@ rush rebuild - Errors! ( ? seconds)
381381

382382
Standard error:
383383
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.
384-
3 of 41: [@uifabric/codepen-loader] completed with warnings in ? seconds
385-
6 of 41: [@uifabric/set-version] completed with warnings in ? seconds
386-
7 of 41: [@uifabric/merge-styles] completed with warnings in ? seconds
387-
8 of 41: [@uifabric/jest-serializer-merge-styles] completed with warnings in ? seconds
388-
10 of 41: [@uifabric/utilities] completed with warnings in ? seconds
389-
11 of 41: [@uifabric/styling] completed with warnings in ? seconds
390-
391-
12 of 41: [@uifabric/foundation] failed to build!
392-
13 of 41: [@uifabric/experiments] blocked by [@uifabric/foundation]!
393-
14 of 41: [@uifabric/fabric-website] blocked by [@uifabric/foundation]!
394-
15 of 41: [@uifabric/pr-deploy-site] blocked by [@uifabric/foundation]!
395-
16 of 41: [@uifabric/react-cards] blocked by [@uifabric/foundation]!
396-
17 of 41: [theming-designer] blocked by [@uifabric/foundation]!
397-
18 of 41: [vr-tests] blocked by [@uifabric/foundation]!
398-
19 of 41: [dom-tests] blocked by [@uifabric/foundation]!
399-
20 of 41: [perf-test] blocked by [@uifabric/foundation]!
400-
21 of 41: [test-bundles] blocked by [@uifabric/foundation]!
401-
22 of 41: [office-ui-fabric-react] blocked by [@uifabric/foundation]!
402-
23 of 41: [@uifabric/api-docs] blocked by [@uifabric/foundation]!
403-
24 of 41: [@uifabric/fabric-website-resources] blocked by [@uifabric/foundation]!
404-
25 of 41: [a11y-tests] blocked by [@uifabric/foundation]!
405-
26 of 41: [ssr-tests] blocked by [@uifabric/foundation]!
406-
27 of 41: [@uifabric/azure-themes] blocked by [@uifabric/foundation]!
407-
28 of 41: [@uifabric/charting] blocked by [@uifabric/foundation]!
408-
29 of 41: [@uifabric/date-time] blocked by [@uifabric/foundation]!
409-
30 of 41: [@uifabric/example-app-base] blocked by [@uifabric/foundation]!
410-
31 of 41: [@uifabric/foundation-scenarios] blocked by [@uifabric/foundation]!
411-
32 of 41: [@uifabric/lists] blocked by [@uifabric/foundation]!
412-
33 of 41: [@uifabric/fluent-theme] blocked by [@uifabric/foundation]!
413-
34 of 41: [@uifabric/tsx-editor] blocked by [@uifabric/foundation]!
414-
35 of 41: [@uifabric/theme-samples] blocked by [@uifabric/foundation]!
415-
36 of 41: [@uifabric/variants] blocked by [@uifabric/foundation]!
416-
37 of 41: [server-rendered-app] blocked by [@uifabric/foundation]!
417-
38 of 41: [todo-app] blocked by [@uifabric/foundation]!
384+
XX of XX: [@uifabric/codepen-loader] completed with warnings in ? seconds
385+
XX of XX: [@uifabric/set-version] completed with warnings in ? seconds
386+
XX of XX: [@uifabric/merge-styles] completed with warnings in ? seconds
387+
XX of XX: [@uifabric/jest-serializer-merge-styles] completed with warnings in ? seconds
388+
XX of XX: [@uifabric/utilities] completed with warnings in ? seconds
389+
XX of XX: [@uifabric/styling] completed with warnings in ? seconds
390+
391+
XX of XX: [@uifabric/foundation] failed to build!
392+
XX of XX: [@uifabric/experiments] blocked by [@uifabric/foundation]!
393+
XX of XX: [@uifabric/fabric-website] blocked by [@uifabric/foundation]!
394+
XX of XX: [@uifabric/pr-deploy-site] blocked by [@uifabric/foundation]!
395+
XX of XX: [@uifabric/react-cards] blocked by [@uifabric/foundation]!
396+
XX of XX: [theming-designer] blocked by [@uifabric/foundation]!
397+
XX of XX: [vr-tests] blocked by [@uifabric/foundation]!
398+
XX of XX: [dom-tests] blocked by [@uifabric/foundation]!
399+
XX of XX: [perf-test] blocked by [@uifabric/foundation]!
400+
XX of XX: [test-bundles] blocked by [@uifabric/foundation]!
401+
XX of XX: [office-ui-fabric-react] blocked by [@uifabric/foundation]!
402+
XX of XX: [@uifabric/api-docs] blocked by [@uifabric/foundation]!
403+
XX of XX: [@uifabric/fabric-website-resources] blocked by [@uifabric/foundation]!
404+
XX of XX: [a11y-tests] blocked by [@uifabric/foundation]!
405+
XX of XX: [ssr-tests] blocked by [@uifabric/foundation]!
406+
XX of XX: [@uifabric/azure-themes] blocked by [@uifabric/foundation]!
407+
XX of XX: [@uifabric/charting] blocked by [@uifabric/foundation]!
408+
XX of XX: [@uifabric/date-time] blocked by [@uifabric/foundation]!
409+
XX of XX: [@uifabric/example-app-base] blocked by [@uifabric/foundation]!
410+
XX of XX: [@uifabric/foundation-scenarios] blocked by [@uifabric/foundation]!
411+
XX of XX: [@uifabric/lists] blocked by [@uifabric/foundation]!
412+
XX of XX: [@uifabric/fluent-theme] blocked by [@uifabric/foundation]!
413+
XX of XX: [@uifabric/tsx-editor] blocked by [@uifabric/foundation]!
414+
XX of XX: [@uifabric/theme-samples] blocked by [@uifabric/foundation]!
415+
XX of XX: [@uifabric/variants] blocked by [@uifabric/foundation]!
416+
XX of XX: [server-rendered-app] blocked by [@uifabric/foundation]!
417+
XX of XX: [todo-app] blocked by [@uifabric/foundation]!
418418
[@uifabric/foundation] Returned error code: 1

0 commit comments

Comments
 (0)