allow to change backend on turbo tasks tests

add tests for new backend
vercel · Aug 5, 2024 · d55f440 · d55f440
1 parent 27aa7e8
commit d55f440
Show file tree

Hide file tree

Showing 36 changed files with 71 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/turbopack/crates/turbo-tasks-backend/Cargo.toml b/turbopack/crates/turbo-tasks-backend/Cargo.toml
@@ -17,17 +17,22 @@ anyhow = { workspace = true }
 async-trait = { workspace = true }
 auto-hash-map = { workspace = true }
 dashmap = { workspace = true }
+indexmap = { workspace = true }
 once_cell = { workspace = true }
 parking_lot = { workspace = true }
+rand = { workspace = true }
+regex = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
+serde_json = { workspace = true }
 smallvec = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 turbo-prehash = { workspace = true }
 turbo-tasks = { workspace = true }
 turbo-tasks-hash = { workspace = true }
 turbo-tasks-malloc = { workspace = true, default-features = false }
+turbo-tasks-testing = { workspace = true }
 
 [build-dependencies]
 turbo-tasks-build = { workspace = true }
diff --git a/turbopack/crates/turbo-tasks-backend/tests/all_in_one.rs b/turbopack/crates/turbo-tasks-backend/tests/all_in_one.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/all_in_one.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/call_types.rs b/turbopack/crates/turbo-tasks-backend/tests/call_types.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/call_types.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/collectibles.rs b/turbopack/crates/turbo-tasks-backend/tests/collectibles.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/collectibles.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/debug.rs b/turbopack/crates/turbo-tasks-backend/tests/debug.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/debug.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/dirty_in_progress.rs b/turbopack/crates/turbo-tasks-backend/tests/dirty_in_progress.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/dirty_in_progress.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/emptied_cells.rs b/turbopack/crates/turbo-tasks-backend/tests/emptied_cells.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/emptied_cells.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/generics.rs b/turbopack/crates/turbo-tasks-backend/tests/generics.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/generics.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/read_ref_cell.rs b/turbopack/crates/turbo-tasks-backend/tests/read_ref_cell.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/read_ref_cell.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/recompute.rs b/turbopack/crates/turbo-tasks-backend/tests/recompute.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/recompute.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/recompute_collectibles.rs b/turbopack/crates/turbo-tasks-backend/tests/recompute_collectibles.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/recompute_collectibles.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/scope_stress.rs b/turbopack/crates/turbo-tasks-backend/tests/scope_stress.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/scope_stress.rs
diff --git a/turbopack/crates/turbo-tasks-backend/tests/test_config.trs b/turbopack/crates/turbo-tasks-backend/tests/test_config.trs
@@ -0,0 +1 @@
+turbo_tasks::TurboTasks::new(turbo_tasks_backend::TurboTasksBackend::new())
diff --git a/turbopack/crates/turbo-tasks-backend/tests/trait_ref_cell.rs b/turbopack/crates/turbo-tasks-backend/tests/trait_ref_cell.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/trait_ref_cell.rs
diff --git a/turbopack/crates/turbo-tasks-fetch/Cargo.toml b/turbopack/crates/turbo-tasks-fetch/Cargo.toml
@@ -31,6 +31,7 @@ turbopack-core = { workspace = true }
 httpmock = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 turbo-tasks-testing = { workspace = true }
+turbo-tasks-memory = { workspace = true }
 
 [build-dependencies]
 turbo-tasks-build = { workspace = true }
diff --git a/turbopack/crates/turbo-tasks-fetch/tests/test_config.trs b/turbopack/crates/turbo-tasks-fetch/tests/test_config.trs
@@ -0,0 +1 @@
+turbo_tasks::TurboTasks::new(turbo_tasks_memory::MemoryBackend::new(usize::MAX))
diff --git a/turbopack/crates/turbo-tasks-macros-tests/Cargo.toml b/turbopack/crates/turbo-tasks-macros-tests/Cargo.toml
@@ -12,6 +12,7 @@ tokio = { workspace = true }
 trybuild = { version = "1.0.97" }
 turbo-tasks = { workspace = true }
 turbo-tasks-testing = { workspace = true }
+turbo-tasks-memory = { workspace = true }
 
 [build-dependencies]
 turbo-tasks-build = { workspace = true }
diff --git a/turbopack/crates/turbo-tasks-macros-tests/tests/test_config.trs b/turbopack/crates/turbo-tasks-macros-tests/tests/test_config.trs
@@ -0,0 +1 @@
+turbo_tasks::TurboTasks::new(turbo_tasks_memory::MemoryBackend::new(usize::MAX))
diff --git a/turbopack/crates/turbo-tasks-memory/tests b/turbopack/crates/turbo-tasks-memory/tests
diff --git a/turbopack/crates/turbo-tasks-memory/tests/all_in_one.rs b/turbopack/crates/turbo-tasks-memory/tests/all_in_one.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/all_in_one.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/call_types.rs b/turbopack/crates/turbo-tasks-memory/tests/call_types.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/call_types.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/collectibles.rs b/turbopack/crates/turbo-tasks-memory/tests/collectibles.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/collectibles.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/debug.rs b/turbopack/crates/turbo-tasks-memory/tests/debug.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/debug.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/dirty_in_progress.rs b/turbopack/crates/turbo-tasks-memory/tests/dirty_in_progress.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/dirty_in_progress.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/emptied_cells.rs b/turbopack/crates/turbo-tasks-memory/tests/emptied_cells.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/emptied_cells.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/generics.rs b/turbopack/crates/turbo-tasks-memory/tests/generics.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/generics.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/read_ref_cell.rs b/turbopack/crates/turbo-tasks-memory/tests/read_ref_cell.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/read_ref_cell.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/recompute.rs b/turbopack/crates/turbo-tasks-memory/tests/recompute.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/recompute.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/recompute_collectibles.rs b/turbopack/crates/turbo-tasks-memory/tests/recompute_collectibles.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/recompute_collectibles.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/scope_stress.rs b/turbopack/crates/turbo-tasks-memory/tests/scope_stress.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/scope_stress.rs
diff --git a/...bo-tasks-testing/tests/task_statistics.rs → ...rbo-tasks-memory/tests/task_statistics.rs b/...bo-tasks-testing/tests/task_statistics.rs → ...rbo-tasks-memory/tests/task_statistics.rs
diff --git a/turbopack/crates/turbo-tasks-memory/tests/test_config.trs b/turbopack/crates/turbo-tasks-memory/tests/test_config.trs
@@ -0,0 +1 @@
+turbo_tasks::TurboTasks::new(turbo_tasks_memory::MemoryBackend::new(usize::MAX))
diff --git a/turbopack/crates/turbo-tasks-memory/tests/trait_ref_cell.rs b/turbopack/crates/turbo-tasks-memory/tests/trait_ref_cell.rs
@@ -0,0 +1 @@
+../../turbo-tasks-testing/tests/trait_ref_cell.rs
diff --git a/turbopack/crates/turbo-tasks-testing/src/run.rs b/turbopack/crates/turbo-tasks-testing/src/run.rs
@@ -1,19 +1,23 @@
-use std::{future::Future, sync::OnceLock};
+use std::{
+    future::Future,
+    sync::{Arc, OnceLock},
+};
 
-use turbo_tasks::{trace::TraceRawVcs, TurboTasks};
-use turbo_tasks_memory::MemoryBackend;
+use turbo_tasks::{run_once, trace::TraceRawVcs, TurboTasksApi};
 
 pub struct Registration {
     execution_lock: OnceLock<()>,
     func: fn(),
+    create_turbo_tasks: fn() -> Arc<dyn TurboTasksApi>,
 }
 
 impl Registration {
     #[doc(hidden)]
-    pub const fn new(func: fn()) -> Self {
+    pub const fn new(create_turbo_tasks: fn() -> Arc<dyn TurboTasksApi>, func: fn()) -> Self {
         Registration {
             execution_lock: OnceLock::new(),
             func,
+            create_turbo_tasks,
         }
     }
 
@@ -23,11 +27,23 @@ impl Registration {
     pub fn ensure_registered(&self) {
         self.execution_lock.get_or_init(self.func);
     }
+
+    pub fn create_turbo_tasks(&self) -> Arc<dyn TurboTasksApi> {
+        (self.create_turbo_tasks)()
+    }
 }
 
 #[macro_export]
 macro_rules! register {
     ($($other_register_fns:expr),* $(,)?) => {{
+        use turbo_tasks::TurboTasksApi;
+        use std::sync::Arc;
+        fn create_turbo_tasks() -> Arc<dyn TurboTasksApi> {
+            include!(concat!(
+                env!("CARGO_MANIFEST_DIR"),
+                "/tests/test_config.trs"
+            ))
+        }
         fn register_impl() {
             $($other_register_fns();)*
             turbo_tasks::register();
@@ -38,7 +54,7 @@ macro_rules! register {
                 ".rs",
             ));
         }
-        turbo_tasks_testing::Registration::new(register_impl)
+        turbo_tasks_testing::Registration::new(create_turbo_tasks, register_impl)
     }};
 }
 
@@ -47,6 +63,6 @@ where
     T: TraceRawVcs + Send + 'static,
 {
     registration.ensure_registered();
-    let tt = TurboTasks::new(MemoryBackend::default());
-    tt.run_once(async move { Ok(fut.await) }).await.unwrap()
+    let tt = registration.create_turbo_tasks();
+    run_once(tt, async move { Ok(fut.await) }).await.unwrap()
 }
diff --git a/turbopack/crates/turbo-tasks-testing/tests/scope_stress.rs b/turbopack/crates/turbo-tasks-testing/tests/scope_stress.rs
@@ -1,8 +1,7 @@
 #![feature(arbitrary_self_types)]
 
 use anyhow::Result;
-use turbo_tasks::{Completion, TryJoinIterExt, TurboTasks, Vc};
-use turbo_tasks_memory::MemoryBackend;
+use turbo_tasks::{run_once, Completion, TryJoinIterExt, Vc};
 use turbo_tasks_testing::{register, Registration};
 
 static REGISTRATION: Registration = register!();
@@ -15,21 +14,21 @@ fn rectangle_stress() {
         .build()
         .unwrap();
     rt.block_on(async {
-        let tt = TurboTasks::new(MemoryBackend::default());
+        let tt = REGISTRATION.create_turbo_tasks();
         let size = std::env::var("TURBOPACK_TEST_RECTANGLE_STRESS_SIZE")
             .map(|size| size.parse().unwrap())
             .unwrap_or(50);
         (0..size)
             .map(|a| (a, size - 1))
             .chain((0..size - 1).map(|b| (size - 1, b)))
             .map(|(a, b)| {
-                let tt = &tt;
+                let tt = tt.clone();
                 async move {
-                    let task = tt.spawn_once_task(async move {
+                    run_once(tt, async move {
                         rectangle(a, b).strongly_consistent().await?;
                         Ok(Vc::<()>::default())
-                    });
-                    tt.wait_task_completion(task, false).await
+                    })
+                    .await
                 }
             })
             .try_join()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../turbo-tasks-testing/tests/collectibles.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../turbo-tasks-testing/tests/dirty_in_progress.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../turbo-tasks-testing/tests/emptied_cells.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../turbo-tasks-testing/tests/read_ref_cell.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../turbo-tasks-testing/tests/recompute_collectibles.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../turbo-tasks-testing/tests/scope_stress.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		turbo_tasks::TurboTasks::new(turbo_tasks_backend::TurboTasksBackend::new())
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../turbo-tasks-testing/tests/trait_ref_cell.rs