mirror of
https://github.com/microsoft/playwright.git
synced 2025-06-26 21:40:17 +00:00
06c7f1fb6c
#19576 introduced a regression where the CLI reporters displayed some times with way too many decimals. e.g. 7.123456789ms. Prior to #19576, there were two monotonicTime implementations; that PR updated the reporters to use the common definition that had existed in utils.ts. However, that introduced a regression in the base.ts reporters which used the ms duration humanizing package which did not account for the more precise decimals used by the shared monotonicTime function. This fix removes the dependency on the third-party ms package and now consistently uses Pavel's humanize function which the HTML reporter had been using and proved to have better defaults for decimals. Additionally, we add more test coverage to limit future regressions since this was caught in passing. Closes #19556. Relates #19576.
68 lines
1.8 KiB
TypeScript
68 lines
1.8 KiB
TypeScript
/*
|
|
Copyright (c) Microsoft Corporation.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
export function msToString(ms: number): string {
|
|
if (!isFinite(ms))
|
|
return '-';
|
|
|
|
if (ms === 0)
|
|
return '0ms';
|
|
|
|
if (ms < 1000)
|
|
return ms.toFixed(0) + 'ms';
|
|
|
|
const seconds = ms / 1000;
|
|
if (seconds < 60)
|
|
return seconds.toFixed(1) + 's';
|
|
|
|
const minutes = seconds / 60;
|
|
if (minutes < 60)
|
|
return minutes.toFixed(1) + 'm';
|
|
|
|
const hours = minutes / 60;
|
|
if (hours < 24)
|
|
return hours.toFixed(1) + 'h';
|
|
|
|
const days = hours / 24;
|
|
return days.toFixed(1) + 'd';
|
|
}
|
|
|
|
export function lowerBound<S, T>(array: S[], object: T, comparator: (object: T, b: S) => number, left?: number, right?: number): number {
|
|
let l = left || 0;
|
|
let r = right !== undefined ? right : array.length;
|
|
while (l < r) {
|
|
const m = (l + r) >> 1;
|
|
if (comparator(object, array[m]) > 0)
|
|
l = m + 1;
|
|
else
|
|
r = m;
|
|
}
|
|
return r;
|
|
}
|
|
|
|
export function upperBound<S, T>(array: S[], object: T, comparator: (object: T, b: S) => number, left?: number, right?: number): number {
|
|
let l = left || 0;
|
|
let r = right !== undefined ? right : array.length;
|
|
while (l < r) {
|
|
const m = (l + r) >> 1;
|
|
if (comparator(object, array[m]) >= 0)
|
|
l = m + 1;
|
|
else
|
|
r = m;
|
|
}
|
|
return r;
|
|
}
|