Merge pull request #9240 from ThomasWaldmann/fix-b20

Fix b20

pyproject.toml

@@ -44,7 +44,8 @@ dependencies = [
 llfuse = ["llfuse >= 1.3.8"]  # fuse 2, low-level
 pyfuse3 = ["pyfuse3 >= 3.1.1"]  # fuse 3, low-level, async
 mfusepy = ["mfusepy >= 3.1.0, <4.0.0"]  # fuse 2+3, high-level
-mfusepym = ["mfusepy @ git+https://github.com/mxmlnkn/mfusepy.git@master"]
+# a pypi release of borgbackup can't contain a dependency on github!
+# mfusepym = ["mfusepy @ git+https://github.com/mxmlnkn/mfusepy.git@master"]
 nofuse = []
 s3 = ["borgstore[s3] ~= 0.3.0"]
 sftp = ["borgstore[sftp] ~= 0.3.0"]

src/borg/testsuite/archiver/extract_cmd_test.py

@@ -565,19 +565,19 @@ def test_extract_xattrs_errors(archivers, request):
         with patch.object(xattr, "setxattr", patched_setxattr_E2BIG):
             out = cmd(archiver, "extract", "test", exit_code=EXIT_WARNING)
             assert "too big for this filesystem" in out
-            assert "when setting extended attribute user.attribute" in out
+            assert "When setting extended attribute user.attribute" in out
         os.remove(input_abspath)
 
         with patch.object(xattr, "setxattr", patched_setxattr_ENOTSUP):
             out = cmd(archiver, "extract", "test", exit_code=EXIT_WARNING)
             assert "ENOTSUP" in out
-            assert "when setting extended attribute user.attribute" in out
+            assert "When setting extended attribute user.attribute" in out
         os.remove(input_abspath)
 
         with patch.object(xattr, "setxattr", patched_setxattr_EACCES):
             out = cmd(archiver, "extract", "test", exit_code=EXIT_WARNING)
             assert "EACCES" in out
-            assert "when setting extended attribute user.attribute" in out
+            assert "When setting extended attribute user.attribute" in out
         assert os.path.isfile(input_abspath)