From 2ce3e3ae60ba44700b5e98a61adc96d80b0e4bd3 Mon Sep 17 00:00:00 2001 From: Micha Reiser Date: Thu, 25 Jul 2024 08:21:38 +0200 Subject: [PATCH] Fix the search path tests on MacOS (#12503) --- crates/red_knot/tests/file_watching.rs | 29 ++++++++------------------ 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/crates/red_knot/tests/file_watching.rs b/crates/red_knot/tests/file_watching.rs index 26ade56707e47..876327f9ec258 100644 --- a/crates/red_knot/tests/file_watching.rs +++ b/crates/red_knot/tests/file_watching.rs @@ -118,29 +118,18 @@ where ) })?; - let workspace_path = temp_dir.path().join("workspace"); - - std::fs::create_dir_all(&workspace_path).with_context(|| { - format!( - "Failed to create workspace directory '{}'", - workspace_path.display() - ) - })?; - - let workspace_path = SystemPath::from_std_path(&workspace_path).ok_or_else(|| { - anyhow!( - "Workspace root '{}' in temp directory is not a valid UTF-8 path.", - workspace_path.display() - ) - })?; - - let workspace_path = SystemPathBuf::from_utf8_path_buf( - workspace_path + let root_path = SystemPathBuf::from_utf8_path_buf( + root_path .as_utf8_path() .canonicalize_utf8() - .with_context(|| "Failed to canonicalize workspace path.")?, + .with_context(|| "Failed to canonicalize root path.")?, ); + let workspace_path = root_path.join("workspace"); + + std::fs::create_dir_all(workspace_path.as_std_path()) + .with_context(|| format!("Failed to create workspace directory '{workspace_path}'",))?; + for (relative_path, content) in workspace_files { let relative_path = relative_path.as_ref(); let absolute_path = workspace_path.join(relative_path); @@ -157,7 +146,7 @@ where let system = OsSystem::new(&workspace_path); let workspace = WorkspaceMetadata::from_path(&workspace_path, &system)?; - let search_paths = create_search_paths(root_path, workspace.root()); + let search_paths = create_search_paths(&root_path, workspace.root()); for path in search_paths .extra_paths