Skip predicate registration whenever _create_covered_cdg also excludes the node

Author: LuKrO2011

src/pynguin/ga/algorithms/llmosalgorithm.py

@@ -184,7 +184,6 @@ def filter_gao_by_coverage(
             test_factory=self._test_factory,
             fitness_functions=self._test_case_fitness_functions,
             coverage_functions=self._test_suite_coverage_functions,
-            model=self.model,
         )
 
     def _get_random_population(self) -> list[tcc.TestCaseChromosome]:

src/pynguin/instrumentation/version/python3_10.py

@@ -868,6 +868,12 @@ def visit_node(  # noqa: D102, C901
         ):
             return
 
+        if ast_info is not None and not any(
+            not isinstance(instr.lineno, int) or ast_info.should_cover_line(instr.lineno)
+            for instr in node.original_instructions
+        ):
+            return
+
         if maybe_jump.name == "FOR_ITER":
             self.visit_for_loop(
                 ast_info,

src/pynguin/instrumentation/version/python3_11.py

@@ -427,7 +427,7 @@ class BranchCoverageInstrumentation(python3_10.BranchCoverageInstrumentation):
         "POP_JUMP_BACKWARD_IF_NONE": PynguinCompare.IS,
     }
 
-    def visit_node(  # noqa: D102
+    def visit_node(  # noqa: D102, C901
         self,
         ast_info: transformer.AstInfo | None,
         cfg: cf.CFG,
@@ -447,6 +447,12 @@ def visit_node(  # noqa: D102
         ):
             return
 
+        if ast_info is not None and not any(
+            not isinstance(instr.lineno, int) or ast_info.should_cover_line(instr.lineno)
+            for instr in node.original_instructions
+        ):
+            return
+
         if maybe_jump.name == "FOR_ITER":
             self.visit_for_loop(
                 ast_info,

src/pynguin/utils/controlflowdistance.py

@@ -206,8 +206,8 @@ def get_non_root_control_flow_distance(
                 executed_predicate_id, trace.true_distances
             ) + _predicate_fitness(executed_predicate_id, trace.false_distances)
             distance = min(distance, candidate)
-        except nx.NetworkXNoPath:
-            # No path from node to target.
+        except (nx.NetworkXNoPath, nx.NodeNotFound):
+            # No path from node to target, or target node not in CDG.
             pass
 
     return distance