prepare for Node.fspath deprecation

RonnyPfannschmidt · RonnyPfannschmidt · commit ef98f1b1841e · 2021-02-07T20:40:20.000+01:00
calculate topdir based on config.rootpath/rootdir addresses pytest-dev/pytest#8251
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],
         )
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Gracefully handle the pending deprecation of Node.fspath by using config.rootpath for topdir.`
Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,14 @@ def run_one_test(self, torun):`
`93`	`93`	`)`
`94`	`94`
`95`	`95`	`def pytest_collection_finish(self, session):`
	`96`	`+ try:`
	`97`	`+ topdir = str(self.config.rootpath)`
	`98`	`+ except AttributeError: # pytest <= 6.1.0`
	`99`	`+ topdir = str(self.config.rootdir)`
	`100`	`+`
`96`	`101`	`self.sendevent(`
`97`	`102`	`"collectionfinish",`
`98`		`- topdir=str(session.fspath),`
	`103`	`+ topdir=topdir,`
`99`	`104`	`ids=[item.nodeid for item in session.items],`
`100`	`105`	`)`
`101`	`106`