prepare for Node.fspath deprecation

calculate topdir based on config.rootpath/rootdir addresses pytest-dev/pytest#8251
pytest-dev · Feb 7, 2021 · ef98f1b · ef98f1b
1 parent ad99d94
commit ef98f1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changelog/623.bugfix.rst b/changelog/623.bugfix.rst
@@ -0,0 +1 @@
+Gracefully handle the pending deprecation of Node.fspath by using config.rootpath for topdir.
diff --git a/src/xdist/remote.py b/src/xdist/remote.py
@@ -93,9 +93,14 @@ def run_one_test(self, torun):
         )
 
     def pytest_collection_finish(self, session):
+        try:
+            topdir = str(self.config.rootpath)
+        except AttributeError: # pytest <= 6.1.0
+            topdir = str(self.config.rootdir)
+
         self.sendevent(
             "collectionfinish",
-            topdir=str(session.fspath),
+            topdir=topdir,
             ids=[item.nodeid for item in session.items],
         )