Skip to content

Commit 48c3a42

Browse files
findepifa-assistant
authored andcommitted
Remove duration from goldie output even if under 1 microsecond (#5772)
* Remove duplicated `|μs|µs|` in patterns * Remove duration from goldie output even if under 1 microsecond When duration was output with single unit component, such as "939ns", it did not match the pattern, as it would require 2+ components. GitOrigin-RevId: bd56931766cdf7cbf082afff08856f8aff606ad2
1 parent 865c20e commit 48c3a42

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

crates/dbt-test-utils/src/task/goldie.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ mod tests {
335335
let line = " Succeeded [ 44.65s] test fusion_tests_schema__ga_analytics_regression__alex.source_unique_incident_io_severity_id";
336336
let postprocess_actual = postprocess_actual(line.to_string(), true);
337337
assert_eq!(
338-
" Succeeded [000.00s] test fusion_tests_schema__replaced.source_unique_incident_io_severity_id",
338+
" Succeeded [duration] test fusion_tests_schema__replaced.source_unique_incident_io_severity_id",
339339
postprocess_actual
340340
);
341341
}

crates/dbt-test-utils/src/task/utils.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,20 @@ static BRACKETED_DURATION_PATTERN: Lazy<Regex> =
3232
Lazy::new(|| Regex::new(r"\[\s*\d+(?:\.\d+)?s\s*\]").unwrap());
3333
static IN_DURATION_PATTERN: Lazy<Regex> = Lazy::new(|| {
3434
// Matches: "in 1s", "in 500ms", "in 1s 298ms", "in 2m 10s", etc.
35-
Regex::new(r"\bin\s+\d+(?:\.\d+)?(?:ns|us|μs|µs|ms|s|m|h)(?:\s+\d+(?:\.\d+)?(?:ns|us|μs|µs|ms|s|m|h))*\b")
36-
.unwrap()
35+
Regex::new(
36+
r"\bin\s+\d+(?:\.\d+)?(?:ns|us|μs|ms|s|m|h)(?:\s+\d+(?:\.\d+)?(?:ns|us|μs|ms|s|m|h))*\b",
37+
)
38+
.unwrap()
3739
});
3840
static LAST_UPDATED_DURATION_PATTERN: Lazy<Regex> = Lazy::new(|| {
3941
// Matches: "Last updated 1s ago", "Last updated 500ms ago", "Last updated 1s 298ms ago", "Last updated 2m 10s ago", etc.
40-
Regex::new(r"\bLast updated\s+\d+(?:\.\d+)?(?:ns|us|μs|µs|ms|s|m|h)(?:\s+\d+(?:\.\d+)?(?:ns|us|μs|µs|ms|s|m|h))* ago\b")
42+
Regex::new(r"\bLast updated\s+\d+(?:\.\d+)?(?:ns|us|μs|ms|s|m|h)(?:\s+\d+(?:\.\d+)?(?:ns|us|μs|ms|s|m|h))* ago\b")
4143
.unwrap()
4244
});
4345
static MULTI_UNIT_DURATION_PATTERN: Lazy<Regex> = Lazy::new(|| {
44-
// Matches sequences of 2+ duration tokens (e.g., "32ms 101us", "4s 703ms 195us 939ns")
45-
Regex::new(r"\b\d+(?:\.\d+)?(?:ns|us|μs|µs|ms|s|m|h)(?:\s+\d+(?:\.\d+)?(?:ns|us|μs|µs|ms|s|m|h)){1,}\b").unwrap()
46+
// Matches sequences of 1+ duration tokens (e.g., "939ns", "32ms 101us", "4s 703ms 195us 939ns")
47+
Regex::new(r"\b\d+(?:\.\d+)?(?:ns|us|μs|ms|s|m|h)(?:\s+\d+(?:\.\d+)?(?:ns|us|μs|ms|s|m|h))*\b")
48+
.unwrap()
4649
});
4750
static AGE_PATTERN: Lazy<Regex> = Lazy::new(|| Regex::new(r"\bage:\s*\d+").unwrap());
4851

0 commit comments

Comments
 (0)