From c3b04683c55fef8929e83429ec17b7a6898c6048 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Thu, 11 Aug 2022 16:59:12 -0400 Subject: refactor(cli): consolidate most MainWorker related code to the same place (#15459) --- cli/lsp/testing/execution.rs | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'cli/lsp/testing/execution.rs') diff --git a/cli/lsp/testing/execution.rs b/cli/lsp/testing/execution.rs index de74de40e..dde834221 100644 --- a/cli/lsp/testing/execution.rs +++ b/cli/lsp/testing/execution.rs @@ -8,7 +8,6 @@ use crate::args::flags_from_vec; use crate::args::DenoSubcommand; use crate::checksum; use crate::create_main_worker; -use crate::located_script_name; use crate::lsp::client::Client; use crate::lsp::client::TestingNotification; use crate::lsp::config; @@ -166,39 +165,7 @@ async fn test_specifier( stderr: StdioPipe::File(sender.stderr()), }, ); - - worker.js_runtime.execute_script( - &located_script_name!(), - r#"Deno[Deno.internal].enableTestAndBench()"#, - )?; - - worker - .execute_script( - &located_script_name!(), - "Deno.core.enableOpCallTracing();", - ) - .unwrap(); - - if mode != test::TestMode::Documentation { - worker.execute_side_module(&specifier).await?; - } - - worker.dispatch_load_event(&located_script_name!())?; - - let test_result = worker.js_runtime.execute_script( - &located_script_name!(), - r#"Deno[Deno.internal].runTests()"#, - )?; - - worker.js_runtime.resolve_value(test_result).await?; - - loop { - if !worker.dispatch_beforeunload_event(&located_script_name!())? { - break; - } - worker.run_event_loop(false).await?; - } - worker.dispatch_unload_event(&located_script_name!())?; + worker.run_lsp_test_specifier(mode).await?; } Ok(()) -- cgit v1.2.3