diff options
Diffstat (limited to 'cli/tools')
| -rw-r--r-- | cli/tools/test/fmt.rs | 20 | ||||
| -rw-r--r-- | cli/tools/test/mod.rs | 16 |
2 files changed, 18 insertions, 18 deletions
diff --git a/cli/tools/test/fmt.rs b/cli/tools/test/fmt.rs index fa2362ea1..fe2007025 100644 --- a/cli/tools/test/fmt.rs +++ b/cli/tools/test/fmt.rs @@ -2,6 +2,7 @@ use deno_core::stats::RuntimeActivity; use deno_core::stats::RuntimeActivityDiff; +use deno_core::stats::RuntimeActivityTrace; use deno_core::stats::RuntimeActivityType; use phf::phf_map; use std::borrow::Cow; @@ -165,16 +166,19 @@ fn format_sanitizer_accum( fn format_sanitizer_accum_item( activity: RuntimeActivity, -) -> (RuntimeActivityType, Cow<'static, str>, Option<String>) { +) -> ( + RuntimeActivityType, + Cow<'static, str>, + Option<RuntimeActivityTrace>, +) { let activity_type = activity.activity(); match activity { - // TODO(mmastrac): OpCallTrace needs to be Eq - RuntimeActivity::AsyncOp(_, name, trace) => { - (activity_type, name.into(), trace.map(|x| x.to_string())) + RuntimeActivity::AsyncOp(_, trace, name) => { + (activity_type, name.into(), trace) } - RuntimeActivity::Interval(_) => (activity_type, "".into(), None), - RuntimeActivity::Resource(_, name) => (activity_type, name.into(), None), - RuntimeActivity::Timer(_) => (activity_type, "".into(), None), + RuntimeActivity::Interval(..) => (activity_type, "".into(), None), + RuntimeActivity::Resource(.., name) => (activity_type, name.into(), None), + RuntimeActivity::Timer(..) => (activity_type, "".into(), None), } } @@ -354,7 +358,7 @@ mod tests { // https://github.com/denoland/deno/issues/13729 // https://github.com/denoland/deno/issues/13938 - leak_format_test!(op_unknown, true, [RuntimeActivity::AsyncOp(0, "op_unknown", None)], + leak_format_test!(op_unknown, true, [RuntimeActivity::AsyncOp(0, None, "op_unknown")], " - An async call to op_unknown was started in this test, but never completed.\n\ To get more details where ops were leaked, run again with --trace-ops flag.\n"); } diff --git a/cli/tools/test/mod.rs b/cli/tools/test/mod.rs index e98df4671..f7a7aed06 100644 --- a/cli/tools/test/mod.rs +++ b/cli/tools/test/mod.rs @@ -518,7 +518,7 @@ async fn test_specifier_inner( if options.trace_ops { worker.execute_script_static( located_script_name!(), - "Deno[Deno.internal].core.setOpCallTracingEnabled(true);", + "Deno[Deno.internal].core.setLeakTracingEnabled(true);", )?; } @@ -740,7 +740,7 @@ fn preprocess_timer_activity(activities: &mut Vec<RuntimeActivity>) { // First, search for any timer resources which will indicate that we have an interval leak activities.retain(|activity| { - if let RuntimeActivity::Resource(_, name) = activity { + if let RuntimeActivity::Resource(.., name) = activity { if name == "timer" { timer_resource_leaked = true; return false; @@ -753,7 +753,7 @@ fn preprocess_timer_activity(activities: &mut Vec<RuntimeActivity>) { // them. if !timer_resource_leaked { activities.retain(|activity| { - if let RuntimeActivity::AsyncOp(_, op, _) = activity { + if let RuntimeActivity::AsyncOp(.., op) = activity { *op != "op_sleep_interval" } else { true @@ -775,7 +775,7 @@ async fn wait_for_activity_to_stabilize( let mut diff = RuntimeActivityStats::diff(&before, &after); preprocess_timer_activity(&mut diff.appeared); preprocess_timer_activity(&mut diff.disappeared); - if diff.appeared.is_empty() && diff.disappeared.is_empty() { + if diff.is_empty() { // No activity, so we return early return Ok(None); } @@ -792,7 +792,7 @@ async fn wait_for_activity_to_stabilize( diff = RuntimeActivityStats::diff(&before, &after); preprocess_timer_activity(&mut diff.appeared); preprocess_timer_activity(&mut diff.disappeared); - if diff.appeared.is_empty() && diff.disappeared.is_empty() { + if diff.is_empty() { return Ok(None); } } @@ -814,11 +814,7 @@ async fn wait_for_activity_to_stabilize( .retain(|activity| !matches!(activity, RuntimeActivity::Resource(..))); } - Ok(if diff.appeared.is_empty() && diff.disappeared.is_empty() { - None - } else { - Some(diff) - }) + Ok(if diff.is_empty() { None } else { Some(diff) }) } fn extract_files_from_regex_blocks( |