mirror of
https://github.com/denoland/deno
synced 2024-08-25 11:07:24 +00:00
refactor(cli): refactor bench/test for future module changes (#21460)
Extracting some refactorings for the module work that will land in https://github.com/denoland/deno_core/pull/359/
This commit is contained in:
parent
ce83a849a4
commit
4a9f429501
6
cli/tests/testdata/bench/no_check.out
vendored
6
cli/tests/testdata/bench/no_check.out
vendored
|
@ -1,5 +1,9 @@
|
|||
error: Uncaught TypeError: Cannot read properties of undefined (reading 'fn')
|
||||
error: TypeError: Cannot read properties of undefined (reading 'fn')
|
||||
Deno.bench();
|
||||
^
|
||||
at [WILDCARD]
|
||||
at [WILDCARD]/bench/no_check.ts:1:6
|
||||
This error was not caught from a benchmark and caused the bench runner to fail on the referenced module.
|
||||
It most likely originated from a dangling promise, event/timeout handler or top-level code.
|
||||
|
||||
error: Bench failed
|
||||
|
|
|
@ -1,7 +1,11 @@
|
|||
Check [WILDCARD]/bench/unhandled_rejection.ts
|
||||
error: Uncaught (in promise) Error: rejection
|
||||
error: (in promise) Error: rejection
|
||||
reject(new Error("rejection"));
|
||||
^
|
||||
at [WILDCARD]/bench/unhandled_rejection.ts:2:10
|
||||
at new Promise (<anonymous>)
|
||||
at [WILDCARD]/bench/unhandled_rejection.ts:1:1
|
||||
This error was not caught from a benchmark and caused the bench runner to fail on the referenced module.
|
||||
It most likely originated from a dangling promise, event/timeout handler or top-level code.
|
||||
|
||||
error: Bench failed
|
||||
|
|
|
@ -3,3 +3,7 @@ error: Top-level await promise never resolved
|
|||
await new Promise((_resolve, _reject) => {});
|
||||
^
|
||||
at <anonymous> ([WILDCARD]bench/unresolved_promise.ts:1:1)
|
||||
This error was not caught from a benchmark and caused the bench runner to fail on the referenced module.
|
||||
It most likely originated from a dangling promise, event/timeout handler or top-level code.
|
||||
|
||||
error: Bench failed
|
||||
|
|
|
@ -42,6 +42,7 @@ use serde::Serialize;
|
|||
use std::collections::HashSet;
|
||||
use std::path::Path;
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
use tokio::sync::mpsc::unbounded_channel;
|
||||
use tokio::sync::mpsc::UnboundedSender;
|
||||
|
||||
|
@ -76,6 +77,7 @@ pub enum BenchEvent {
|
|||
Register(BenchDescription),
|
||||
Wait(usize),
|
||||
Result(usize, BenchResult),
|
||||
UncaughtError(String, Box<JsError>),
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||||
|
@ -166,6 +168,38 @@ async fn bench_specifier(
|
|||
specifier: ModuleSpecifier,
|
||||
sender: UnboundedSender<BenchEvent>,
|
||||
filter: TestFilter,
|
||||
) -> Result<(), AnyError> {
|
||||
match bench_specifier_inner(
|
||||
worker_factory,
|
||||
permissions,
|
||||
specifier.clone(),
|
||||
&sender,
|
||||
filter,
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(()) => Ok(()),
|
||||
Err(error) => {
|
||||
if error.is::<JsError>() {
|
||||
sender.send(BenchEvent::UncaughtError(
|
||||
specifier.to_string(),
|
||||
Box::new(error.downcast::<JsError>().unwrap()),
|
||||
))?;
|
||||
Ok(())
|
||||
} else {
|
||||
Err(error)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Run a single specifier as an executable bench module.
|
||||
async fn bench_specifier_inner(
|
||||
worker_factory: Arc<CliMainWorkerFactory>,
|
||||
permissions: Permissions,
|
||||
specifier: ModuleSpecifier,
|
||||
sender: &UnboundedSender<BenchEvent>,
|
||||
filter: TestFilter,
|
||||
) -> Result<(), AnyError> {
|
||||
let mut worker = worker_factory
|
||||
.create_custom_worker(
|
||||
|
@ -180,6 +214,10 @@ async fn bench_specifier(
|
|||
worker.execute_side_module_possibly_with_npm().await?;
|
||||
|
||||
let mut worker = worker.into_main_worker();
|
||||
|
||||
// Ensure that there are no pending exceptions before we start running tests
|
||||
worker.run_up_to_duration(Duration::from_millis(0)).await?;
|
||||
|
||||
worker.dispatch_load_event(located_script_name!())?;
|
||||
|
||||
let benchmarks = {
|
||||
|
@ -227,6 +265,11 @@ async fn bench_specifier(
|
|||
// event loop to continue beyond what's needed to await results.
|
||||
worker.dispatch_beforeunload_event(located_script_name!())?;
|
||||
worker.dispatch_unload_event(located_script_name!())?;
|
||||
|
||||
// Ensure the worker has settled so we can catch any remaining unhandled rejections. We don't
|
||||
// want to wait forever here.
|
||||
worker.run_up_to_duration(Duration::from_millis(0)).await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
@ -308,6 +351,11 @@ async fn bench_specifiers(
|
|||
}
|
||||
};
|
||||
}
|
||||
|
||||
BenchEvent::UncaughtError(origin, error) => {
|
||||
report.failed += 1;
|
||||
reporter.report_uncaught_error(&origin, error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ pub trait BenchReporter {
|
|||
fn report_wait(&mut self, desc: &BenchDescription);
|
||||
fn report_output(&mut self, output: &str);
|
||||
fn report_result(&mut self, desc: &BenchDescription, result: &BenchResult);
|
||||
fn report_uncaught_error(&mut self, origin: &str, error: Box<JsError>);
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize)]
|
||||
|
@ -91,6 +92,8 @@ impl BenchReporter for JsonReporter {
|
|||
});
|
||||
}
|
||||
}
|
||||
|
||||
fn report_uncaught_error(&mut self, _origin: &str, _error: Box<JsError>) {}
|
||||
}
|
||||
|
||||
pub struct ConsoleReporter {
|
||||
|
@ -301,4 +304,15 @@ impl BenchReporter for ConsoleReporter {
|
|||
fn report_end(&mut self, _: &BenchReport) {
|
||||
self.report_group_summary();
|
||||
}
|
||||
|
||||
fn report_uncaught_error(&mut self, _origin: &str, error: Box<JsError>) {
|
||||
println!(
|
||||
"{}: {}",
|
||||
colors::red_bold("error"),
|
||||
format_test_error(&error)
|
||||
);
|
||||
println!("This error was not caught from a benchmark and caused the bench runner to fail on the referenced module.");
|
||||
println!("It most likely originated from a dangling promise, event/timeout handler or top-level code.");
|
||||
println!();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -410,6 +410,41 @@ pub async fn test_specifier(
|
|||
mut sender: TestEventSender,
|
||||
fail_fast_tracker: FailFastTracker,
|
||||
options: TestSpecifierOptions,
|
||||
) -> Result<(), AnyError> {
|
||||
match test_specifier_inner(
|
||||
worker_factory,
|
||||
permissions,
|
||||
specifier.clone(),
|
||||
&sender,
|
||||
fail_fast_tracker,
|
||||
options,
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(()) => Ok(()),
|
||||
Err(error) => {
|
||||
if error.is::<JsError>() {
|
||||
sender.send(TestEvent::UncaughtError(
|
||||
specifier.to_string(),
|
||||
Box::new(error.downcast::<JsError>().unwrap()),
|
||||
))?;
|
||||
Ok(())
|
||||
} else {
|
||||
Err(error)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Test a single specifier as documentation containing test programs, an executable test module or
|
||||
/// both.
|
||||
async fn test_specifier_inner(
|
||||
worker_factory: Arc<CliMainWorkerFactory>,
|
||||
permissions: Permissions,
|
||||
specifier: ModuleSpecifier,
|
||||
sender: &TestEventSender,
|
||||
fail_fast_tracker: FailFastTracker,
|
||||
options: TestSpecifierOptions,
|
||||
) -> Result<(), AnyError> {
|
||||
if fail_fast_tracker.should_stop() {
|
||||
return Ok(());
|
||||
|
@ -439,23 +474,13 @@ pub async fn test_specifier(
|
|||
}
|
||||
|
||||
// We execute the main module as a side module so that import.meta.main is not set.
|
||||
match worker.execute_side_module_possibly_with_npm().await {
|
||||
Ok(()) => {}
|
||||
Err(error) => {
|
||||
if error.is::<JsError>() {
|
||||
sender.send(TestEvent::UncaughtError(
|
||||
specifier.to_string(),
|
||||
Box::new(error.downcast::<JsError>().unwrap()),
|
||||
))?;
|
||||
return Ok(());
|
||||
} else {
|
||||
return Err(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
worker.execute_side_module_possibly_with_npm().await?;
|
||||
|
||||
let mut worker = worker.into_main_worker();
|
||||
|
||||
// Ensure that there are no pending exceptions before we start running tests
|
||||
worker.run_up_to_duration(Duration::from_millis(0)).await?;
|
||||
|
||||
worker.dispatch_load_event(located_script_name!())?;
|
||||
|
||||
run_tests_for_worker(&mut worker, &specifier, &options, &fail_fast_tracker)
|
||||
|
@ -466,6 +491,10 @@ pub async fn test_specifier(
|
|||
worker.dispatch_beforeunload_event(located_script_name!())?;
|
||||
worker.dispatch_unload_event(located_script_name!())?;
|
||||
|
||||
// Ensure the worker has settled so we can catch any remaining unhandled rejections. We don't
|
||||
// want to wait forever here.
|
||||
worker.run_up_to_duration(Duration::from_millis(0)).await?;
|
||||
|
||||
if let Some(coverage_collector) = coverage_collector.as_mut() {
|
||||
worker
|
||||
.js_runtime
|
||||
|
|
|
@ -698,7 +698,6 @@ impl WebWorker {
|
|||
|
||||
event_loop_result = self.js_runtime.run_event_loop(false) => {
|
||||
event_loop_result?;
|
||||
|
||||
receiver.await
|
||||
}
|
||||
}
|
||||
|
@ -730,7 +729,6 @@ impl WebWorker {
|
|||
return Ok(());
|
||||
}
|
||||
event_loop_result?;
|
||||
|
||||
receiver.await
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@ use std::sync::atomic::Ordering::Relaxed;
|
|||
use std::sync::Arc;
|
||||
use std::task::Context;
|
||||
use std::task::Poll;
|
||||
use std::time::Duration;
|
||||
use std::time::Instant;
|
||||
|
||||
use deno_broadcast_channel::InMemoryBroadcastChannel;
|
||||
|
@ -29,6 +30,7 @@ use deno_core::ModuleLoader;
|
|||
use deno_core::ModuleSpecifier;
|
||||
use deno_core::OpMetricsFactoryFn;
|
||||
use deno_core::OpMetricsSummaryTracker;
|
||||
use deno_core::PollEventLoopOptions;
|
||||
use deno_core::RuntimeOptions;
|
||||
use deno_core::SharedArrayBufferStore;
|
||||
use deno_core::Snapshot;
|
||||
|
@ -553,12 +555,32 @@ impl MainWorker {
|
|||
|
||||
event_loop_result = self.run_event_loop(false) => {
|
||||
event_loop_result?;
|
||||
|
||||
receiver.await
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Run the event loop up to a given duration. If the runtime resolves early, returns
|
||||
/// early. Will always poll the runtime at least once.
|
||||
pub async fn run_up_to_duration(
|
||||
&mut self,
|
||||
duration: Duration,
|
||||
) -> Result<(), AnyError> {
|
||||
match tokio::time::timeout(
|
||||
duration,
|
||||
self.js_runtime.run_event_loop2(PollEventLoopOptions {
|
||||
wait_for_inspector: false,
|
||||
pump_v8_message_loop: true,
|
||||
}),
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(Ok(_)) => Ok(()),
|
||||
Err(_) => Ok(()),
|
||||
Ok(Err(e)) => Err(e),
|
||||
}
|
||||
}
|
||||
|
||||
/// Loads, instantiates and executes specified JavaScript module.
|
||||
pub async fn execute_side_module(
|
||||
&mut self,
|
||||
|
|
Loading…
Reference in a new issue