Review feedback.

# Rust tests will be skipped. Delete if not intended. [ci skip-rust-tests]
pantsbuild · Jul 21, 2020 · e5d4502 · e5d4502
1 parent 4ffa262
commit e5d4502
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/python/pants/engine/internals/graph.py b/src/python/pants/engine/internals/graph.py
@@ -181,26 +181,26 @@ async def transitive_targets(targets: Targets) -> TransitiveTargets:
     """
     visited: OrderedSet[Target] = OrderedSet()
     queued = FrozenOrderedSet(targets)
-    dependency_mapping: Dict[Address, Tuple[Address, ...]] = {}
+    # dependency_mapping: Dict[Address, Tuple[Address, ...]] = {}
     while queued:
         direct_dependencies = await MultiGet(
             Get(Targets, DependenciesRequest(tgt.get(Dependencies))) for tgt in queued
         )
 
-        dependency_mapping.update(
-            zip(
-                (t.address for t in queued),
-                (tuple(t.address for t in deps) for deps in direct_dependencies),
-            )
-        )
+        # dependency_mapping.update(
+        #    zip(
+        #        (t.address for t in queued),
+        #        (tuple(t.address for t in deps) for deps in direct_dependencies),
+        #    )
+        # )
 
         queued = FrozenOrderedSet(itertools.chain.from_iterable(direct_dependencies)).difference(
             visited
         )
         visited.update(queued)
 
     transitive_targets = TransitiveTargets(tuple(targets), FrozenOrderedSet(visited))
-    _detect_cycles(tuple(t.address for t in targets), dependency_mapping)
+    # _detect_cycles(tuple(t.address for t in targets), dependency_mapping)
     return transitive_targets
 
 

diff --git a/src/python/pants/engine/internals/graph_test.py b/src/python/pants/engine/internals/graph_test.py
@@ -153,7 +153,7 @@ def test_transitive_targets_tolerates_subtarget_cycles(self) -> None:
             Address("", target_name="t2.txt", generated_base_target_name="t2"),
         ]
 
-    def do_test_failed_cycle(self, address_str: str, cyclic_address_str: str) -> None:
+    def assert_failed_cycle(self, address_str: str, cyclic_address_str: str) -> None:
         with self.assertRaisesRegex(
             Exception,
             f"(?ms)Dependency graph contained a cycle:.*-> {cyclic_address_str}.*-> {cyclic_address_str}.*",
@@ -172,7 +172,7 @@ def test_cycle_self(self) -> None:
                 """
             ),
         )
-        self.do_test_failed_cycle("//:t1", "//:t1")
+        self.assert_failed_cycle("//:t1", "//:t1")
 
     def test_cycle_direct(self) -> None:
         self.add_to_build_file(
@@ -184,8 +184,8 @@ def test_cycle_direct(self) -> None:
                 """
             ),
         )
-        self.do_test_failed_cycle("//:t1", "//:t1")
-        self.do_test_failed_cycle("//:t2", "//:t2")
+        self.assert_failed_cycle("//:t1", "//:t1")
+        self.assert_failed_cycle("//:t2", "//:t2")
 
     def test_cycle_indirect(self) -> None:
         self.add_to_build_file(
@@ -198,8 +198,8 @@ def test_cycle_indirect(self) -> None:
                 """
             ),
         )
-        self.do_test_failed_cycle("//:t1", "//:t2")
-        self.do_test_failed_cycle("//:t2", "//:t2")
+        self.assert_failed_cycle("//:t1", "//:t2")
+        self.assert_failed_cycle("//:t2", "//:t2")
 
     def test_resolve_generated_subtarget(self) -> None:
         self.add_to_build_file("demo", "target(sources=['f1.txt', 'f2.txt'])")