Ensure collector nodeid is assigned consistently

nbcheck/api.py

@@ -21,7 +21,7 @@ def from_path(cls, path: Path, session: pytest.Session):
         relpath = bestrelpath(session.config.rootpath, path)
 
         return cls.from_parent(
-            parent=session,
+            session,
             name=relpath,
             nodeid=relpath,
         )
@@ -43,7 +43,7 @@ def from_path(cls,
         )
 
         return cls.from_parent(
-            parent=parent,
+            parent,
             name=path.name,
             nb=nb,
             path=path,

nbcheck/cell_order.py

@@ -25,7 +25,7 @@ def from_code_cells(cls, code_cells: Iterable[Cell], parent: pytest.Collector):
         for expected_index, cell in enumerate(code_cells, start=1):
             name = f"[{expected_index}]"
             yield cls.from_parent(
-                parent=parent,
+                parent,
                 name=name,
                 cell=cell,
                 expected=expected_index,
@@ -70,7 +70,7 @@ def collect(self):
         for expected_index, cell in enumerate(self.cells, start=1):
             name = f"[{expected_index}]"
             yield CellIndexCheck.from_parent(
-                parent=self,
+                self,
                 name=name,
                 cell=cell,
                 expected=expected_index,
@@ -80,9 +80,9 @@ def collect(self):
 def pytest_nbcollect_makeitem(collector: Notebook):
     cells = collector.code_cells
     return CellOrder.from_parent(
-        parent=collector,
+        collector,
         cells=cells,
-        name=f"(code) 1-{len(cells)}"
+        name=f"cell_order (1-{len(cells)})"
     )
 
 

nbcheck/execution.py

@@ -64,6 +64,16 @@ def pytest_nbcheck_info(config: pytest.Config) -> List[str]:
 
 
 class CellsExec(nbval_plugin.IPyNbFile):
+    def __init__(self, *, name=None, nodeid=None, parent=None, **kwargs):
+        if nodeid is None and parent is not None and name is not None:
+            # this is to ensure a consistent behavior with the sub-collectors
+            # (i.e. whose parent is a nbcheck.api.Notebook) from the other nbcheck plugins
+            # since they're not subclasses of pytest.FSCollector
+            # It looks like if nodeid is not set explicitly and path == self.parent.path,
+            # the nodeid will be mangled with extra :: to ensure uniqueness
+            nodeid = f"{parent.nodeid}::{name}"
+        super().__init__(name=name, nodeid=nodeid, parent=parent, **kwargs)
+
     def collect(self):
         # overwrite the default 0-based cell_num
         orig_items = super().collect()
@@ -82,8 +92,9 @@ def collect(self):
 @pytest.hookimpl(trylast=True)
 def pytest_nbcollect_makeitem(collector: Notebook):
     return CellsExec.from_parent(
-        parent=collector,
+        collector,
         path=collector.path,
+        name="exec (nbval)"
     )
 
 

nbcheck/headers.py

@@ -124,7 +124,7 @@ def reportinfo(self):
 def pytest_nbcollect_makeitem(collector: Notebook):
     headers = Headers.from_markdown_cells(collector.markdown_cells)
     return HeaderStructure.from_parent(
-        parent=collector,
+        collector,
         name=f"headers ({len(headers)})",
         headers=headers,
     )