Merge pull request datalad#7622 from yarikoptic/bf-wtf

Make test for presence of max_path in partitions not run for current psutil 6.0.0
christian-monch · Jun 20, 2024 · 35564bf · 35564bf
2 parents a537cdb + 9070ae9
commit 35564bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/changelog.d/pr-7622.md b/changelog.d/pr-7622.md
@@ -0,0 +1,3 @@
+### 🧪 Tests
+
+- Make test for presence of max_path in partitions not run for current psutil 6.0.0.  [PR #7622](https://github.com/datalad/datalad/pull/7622) (by [@yarikoptic](https://github.com/yarikoptic))
diff --git a/datalad/local/tests/test_wtf.py b/datalad/local/tests/test_wtf.py
@@ -80,8 +80,10 @@ def test_wtf(topdir=None):
         assert_not_in(_HIDDEN, cmo.out)  # all is shown
         assert_in('user.name: ', cmo.out)
         if external_versions['psutil']:
-            # filesystems detail should be reported
-            assert_in('max_pathlength:', cmo.out)
+            if external_versions['psutil'] < '6.0.0':
+                # filesystems detail should be reported, unless 6.0.0 where
+                # it was removed. See https://github.com/giampaolo/psutil/issues/2109
+                assert_in('max_pathlength:', cmo.out)
         else:
             assert_in("Hint: install psutil", cmo.out)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### 🧪 Tests

		- Make test for presence of max_path in partitions not run for current psutil 6.0.0. [PR #7622](https://github.com/datalad/datalad/pull/7622) (by [@yarikoptic](https://github.com/yarikoptic))