3 files changed, 28 insertions(+), 51 deletions(-)

M gnu/local.mk
M gnu/packages/check.scm
D gnu/packages/patches/python-pyfakefs-remove-bad-test.patch

@@ 2160,7 2160,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \
   %D%/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch	\
   %D%/packages/patches/python-pillow-CVE-2022-45199.patch	\
-  %D%/packages/patches/python-pyfakefs-remove-bad-test.patch	\
   %D%/packages/patches/python-libxml2-utf8.patch		\
   %D%/packages/patches/python-memcached-syntax-warnings.patch	\
   %D%/packages/patches/python-mox3-python3.6-compat.patch	\

@@ 3894,37 3894,38 @@ grew out of the @dfn{Vc} project.")
       (license license:bsd-3))))
 
 (define-public python-pyfakefs
+  ;; TODO: Move to python-build.
   (package
     (name "python-pyfakefs")
-    (version "4.6.3")
-    (source (origin
-              (method url-fetch)
-              ;; We use the PyPI URL because there is no proper release
-              ;; available from GitHub.  The GitHub project only provides
-              ;; autogenerated tarballs, which are known to change in place.
-              (uri (pypi-uri "pyfakefs" version))
-              (sha256
-               (base32
-                "18bcv8yalg80zgigx40fk692yr3wf9ch1hkb0cdplqspyry2mwbd"))
-              (patches (search-patches
-                        "python-pyfakefs-remove-bad-test.patch"))
-              (file-name (string-append name "-" version ".tar.gz"))))
+    (version "5.9.1")
+    (source
+     (origin
+       (method git-fetch)       ;no tets in PyPI archive
+       (uri (git-reference
+              (url "https://github.com/pytest-dev/pyfakefs")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0xdq8fgbqrrnhwbgklwfngmpzgna2frr9vc318vy1rb0vhsmzvjk"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         ;; The default test suite does not run these extra tests.
-         (add-after 'check 'check-pytest-plugin
-           (lambda _
-             (invoke
-              "python" "-m" "pytest"
-              "pyfakefs/pytest_tests/pytest_plugin_test.py"))))))
+     (list
+      #:test-backend #~'custom
+      ;; Ran 2699 tests; 1177 skipped, 2 expected failures
+      #:test-flags
+      #~(list "-m" "pyfakefs.tests.all_tests_without_extra_packages")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-root-tests
+            (lambda _
+              (substitute* "pyfakefs/tests/fake_filesystem_test.py"
+                (("def test_expand_root")
+                 "def __off_test_expand_root")))))))
+    ;; As it would be imported by many through python-importlib-metadata, keep
+    ;; dependencies on bare minimal.
     (native-inputs
-     (list python-pytest))
-    (build-system python-build-system)
-    ;; Guix lint doesn't like that this is a permanent redirect to the GitHub
-    ;; page, but the pyfakefs documentation asks us to use this specific URL
-    ;; when linking to the project.  Honor their request.
-    (home-page "http://pyfakefs.org/")
+     (list python-setuptools))
+    (home-page "https://github.com/pytest-dev/pyfakefs")
     ;; TRANSLATORS: In the synopsis, "Mock" is a verb.
     (synopsis "Mock file system interactions in tests")
     (description

@@ 1,23 0,0 @@
-This test incorrectly assumes that the root user is always available.
-However, in the build environment, the root user is not available.
-Note that because the original file distributed in the release on PyPi
-has lines ending in CRLF, those are retained in the diff below.
-
---- a/pyfakefs/tests/fake_filesystem_test.py	1969-12-31 16:00:00.000000000 -0800
-+++ b/pyfakefs/tests/fake_filesystem_test.py	1969-12-31 16:00:00.000000000 -0800
-@@ -1021,15 +1021,6 @@
-             self.assertEqual(self.path.expanduser('~'),
-                              self.os.environ['HOME'].replace('/', '!'))
- 
--    @unittest.skipIf(TestCase.is_windows or TestCase.is_cygwin,
--                     'only tested on unix systems')
--    def test_expand_root(self):
--        if sys.platform == 'darwin':
--            roothome = '!var!root'
--        else:
--            roothome = '!root'
--        self.assertEqual(self.path.expanduser('~root'), roothome)
--
-     def test_getsize_path_nonexistent(self):
-         file_path = 'foo!bar!baz'
-         self.assertRaises(os.error, self.path.getsize, file_path)