From 517946b15cbb6dab3dda7e1161b6efc380eaa792 Mon Sep 17 00:00:00 2001 From: Benjamin Woodruff Date: Mon, 20 Jan 2025 17:03:43 -0800 Subject: [PATCH] Update snapshot unit test, the stack is changed because we resolve the Vc earlier --- turbopack/crates/turbopack-tests/tests/execution.rs | 8 ++++---- turbopack/crates/turbopack-tests/tests/snapshot.rs | 5 ++--- ... => Code generation for chunk item errored-1c3f39.txt} | 1 - ...ck-tests_tests_snapshot_imports_json_input_52abdb._.js | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) rename turbopack/crates/turbopack-tests/tests/snapshot/imports/json/issues/{Code generation for chunk item errored-2c5cf4.txt => Code generation for chunk item errored-1c3f39.txt} (93%) diff --git a/turbopack/crates/turbopack-tests/tests/execution.rs b/turbopack/crates/turbopack-tests/tests/execution.rs index d954007e2cbc6..5d867f6b47901 100644 --- a/turbopack/crates/turbopack-tests/tests/execution.rs +++ b/turbopack/crates/turbopack-tests/tests/execution.rs @@ -172,7 +172,7 @@ async fn run(resource: PathBuf, snapshot_mode: IssueSnapshotMode) -> Result) -> Result, - run_result: OperationVc, + run_result_op: OperationVc, ) -> Result> { let PreparedTest { path, .. } = *prepared_test.await?; - let _ = run_result.connect().resolve_strongly_consistent().await; + let _ = run_result_op.resolve_strongly_consistent().await; - let captured_issues = run_result.peek_issues_with_path().await?; + let captured_issues = run_result_op.peek_issues_with_path().await?; let plain_issues = captured_issues .iter_with_shortest_path() diff --git a/turbopack/crates/turbopack-tests/tests/snapshot.rs b/turbopack/crates/turbopack-tests/tests/snapshot.rs index c148541617c57..f4e3e687354d2 100644 --- a/turbopack/crates/turbopack-tests/tests/snapshot.rs +++ b/turbopack/crates/turbopack-tests/tests/snapshot.rs @@ -159,7 +159,7 @@ async fn run(resource: PathBuf) -> Result<()> { let tt = TurboTasks::new(MemoryBackend::default()); let task = tt.spawn_once_task(async move { let emit_op = run_inner_operation(resource.to_str().unwrap().into()); - emit_op.connect().strongly_consistent().await?; + emit_op.read_strongly_consistent().await?; apply_effects(emit_op).await?; Ok(Vc::<()>::default()) @@ -173,8 +173,7 @@ async fn run(resource: PathBuf) -> Result<()> { #[turbo_tasks::function(operation)] async fn run_inner_operation(resource: RcStr) -> Result<()> { let out_op = run_test_operation(resource); - let out_vc = out_op.connect(); - let _ = out_vc.resolve_strongly_consistent().await?; + let out_vc = out_op.resolve_strongly_consistent().await?; let captured_issues = out_op.peek_issues_with_path().await?; let plain_issues = captured_issues diff --git a/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/issues/Code generation for chunk item errored-2c5cf4.txt b/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/issues/Code generation for chunk item errored-1c3f39.txt similarity index 93% rename from turbopack/crates/turbopack-tests/tests/snapshot/imports/json/issues/Code generation for chunk item errored-2c5cf4.txt rename to turbopack/crates/turbopack-tests/tests/snapshot/imports/json/issues/Code generation for chunk item errored-1c3f39.txt index 0a90933ef22ad..bbd784fc6b572 100644 --- a/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/issues/Code generation for chunk item errored-2c5cf4.txt +++ b/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/issues/Code generation for chunk item errored-1c3f39.txt @@ -6,7 +6,6 @@ error - [code gen] [project]/turbopack/crates/turbopack-tests/tests/snapshot/imp Debug info: - An error occurred while generating the chunk item [project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json) - - Execution of *EcmascriptChunkItemContent::module_factory failed - Execution of ::content failed - Unable to make a module from invalid JSON: expected `,` or `}` at line 3 column 26 at nested.? diff --git a/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/output/turbopack_crates_turbopack-tests_tests_snapshot_imports_json_input_52abdb._.js b/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/output/turbopack_crates_turbopack-tests_tests_snapshot_imports_json_input_52abdb._.js index aae4c7f85e4be..f2e9c09bd8563 100644 --- a/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/output/turbopack_crates_turbopack-tests_tests_snapshot_imports_json_input_52abdb._.js +++ b/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/output/turbopack_crates_turbopack-tests_tests_snapshot_imports_json_input_52abdb._.js @@ -7,7 +7,7 @@ var { r: __turbopack_require__, f: __turbopack_module_context__, i: __turbopack_ __turbopack_export_value__(JSON.parse("{\"name\":\"json-snapshot\"}"));}}), "[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)": (() => {{ -throw new Error("An error occurred while generating the chunk item [project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)\n\nCaused by:\n- Unable to make a module from invalid JSON: expected `,` or `}` at line 3 column 26\n\nDebug info:\n- An error occurred while generating the chunk item [project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)\n- Execution of *EcmascriptChunkItemContent::module_factory failed\n- Execution of ::content failed\n- Unable to make a module from invalid JSON: expected `,` or `}` at line 3 column 26\n at nested.?\n 1 | {\n 2 | \"nested\": {\n | v\n 3 + \"this-is\": \"invalid\" // lint-staged will remove trailing commas, so here's a comment\n | ^\n 4 | }\n 5 | }"); +throw new Error("An error occurred while generating the chunk item [project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)\n\nCaused by:\n- Unable to make a module from invalid JSON: expected `,` or `}` at line 3 column 26\n\nDebug info:\n- An error occurred while generating the chunk item [project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)\n- Execution of ::content failed\n- Unable to make a module from invalid JSON: expected `,` or `}` at line 3 column 26\n at nested.?\n 1 | {\n 2 | \"nested\": {\n | v\n 3 + \"this-is\": \"invalid\" // lint-staged will remove trailing commas, so here's a comment\n | ^\n 4 | }\n 5 | }"); }}), "[project]/turbopack/crates/turbopack-tests/tests/snapshot/imports/json/input/index.js [test] (ecmascript)": ((__turbopack_context__) => {