@@ -34,6 +34,12 @@ def test_dependency_resolver_visits_workspace_notebook_dependencies(simple_depen
3434 assert maybe .graph .all_relative_names () == {"root3.run.py" , "root1.run.py" , "leaf1.py" , "leaf2.py" }
3535
3636
37+ def test_dependency_resolver_locates_root_dependencies (simple_dependency_resolver ):
38+ maybe = simple_dependency_resolver .build_notebook_dependency_graph (Path ("root3.run.py" ), CurrentSessionState ())
39+ assert not maybe .failed
40+ assert maybe .graph .root_relative_names () == {"root3.run.py" }
41+
42+
3743def test_dependency_resolver_visits_local_notebook_dependencies (simple_dependency_resolver ):
3844 maybe = simple_dependency_resolver .build_notebook_dependency_graph (Path ("root4.py" ), CurrentSessionState ())
3945 assert not maybe .failed
@@ -52,7 +58,7 @@ def test_dependency_resolver_visits_workspace_file_dependencies(simple_dependenc
5258 assert maybe .graph .all_relative_names () == {'leaf1.py' , 'leaf2.py' , 'root8.py' }
5359
5460
55- def test_dependency_resolver_raises_problem_with_unfound_workspace_notebook_dependency (simple_dependency_resolver ):
61+ def test_dependency_resolver_raises_problem_with_unresolved_workspace_notebook_dependency (simple_dependency_resolver ):
5662 maybe = simple_dependency_resolver .build_notebook_dependency_graph (
5763 Path ("root1-no-leaf.run.py" ), CurrentSessionState ()
5864 )
@@ -69,7 +75,7 @@ def test_dependency_resolver_raises_problem_with_unfound_workspace_notebook_depe
6975 ]
7076
7177
72- def test_dependency_resolver_raises_problem_with_unfound_local_notebook_dependency (simple_dependency_resolver ):
78+ def test_dependency_resolver_raises_problem_with_unresolved_local_notebook_dependency (simple_dependency_resolver ):
7379 maybe = simple_dependency_resolver .build_notebook_dependency_graph (Path ("root4-no-leaf.py" ), CurrentSessionState ())
7480 assert list (maybe .problems ) == [
7581 DependencyProblem (
@@ -142,14 +148,14 @@ def test_dependency_resolver_terminates_at_known_libraries(empty_index, mock_not
142148 assert maybe .failed
143149
144150
145- def test_dependency_resolver_raises_problem_with_unfound_root_file (simple_dependency_resolver ):
151+ def test_dependency_resolver_raises_problem_with_unresolved_root_file (simple_dependency_resolver ):
146152 maybe = simple_dependency_resolver .build_local_file_dependency_graph (Path ("non-existing.py" ), CurrentSessionState ())
147153 assert list (maybe .problems ) == [
148154 DependencyProblem ('file-not-found' , 'File not found: non-existing.py' , Path ("non-existing.py" ))
149155 ]
150156
151157
152- def test_dependency_resolver_raises_problem_with_unfound_root_notebook (simple_dependency_resolver ):
158+ def test_dependency_resolver_raises_problem_with_unresolved_root_notebook (simple_dependency_resolver ):
153159 maybe = simple_dependency_resolver .build_notebook_dependency_graph (Path ("unknown_notebook" ), CurrentSessionState ())
154160 assert list (maybe .problems ) == [
155161 DependencyProblem ('notebook-not-found' , 'Notebook not found: unknown_notebook' , Path ("unknown_notebook" ))
@@ -183,8 +189,10 @@ def load_dependency(self, path_lookup: PathLookup, dependency: Dependency) -> So
183189
184190 notebook_loader = FailingNotebookLoader ()
185191 notebook_resolver = NotebookResolver (notebook_loader )
186- pip_resolver = PythonLibraryResolver (KnownList ())
187- resolver = DependencyResolver (pip_resolver , notebook_resolver , [], mock_path_lookup )
192+ known_list = KnownList ()
193+ pip_resolver = PythonLibraryResolver (known_list )
194+ import_resolver = ImportFileResolver (FileLoader (), known_list )
195+ resolver = DependencyResolver (pip_resolver , notebook_resolver , import_resolver , mock_path_lookup )
188196 maybe = resolver .build_notebook_dependency_graph (Path ("root5.py" ), CurrentSessionState ())
189197 assert list (maybe .problems ) == [
190198 DependencyProblem ('cannot-load-notebook' , 'Could not load notebook root5.py' , Path ('<MISSING_SOURCE_PATH>' ))
0 commit comments