Merge pull request #7582 from ThomasWaldmann/vagrant-updates-master

Vagrant updates master

Vagrantfile

@@ -242,8 +242,8 @@ def install_pythons(boxname)
     . ~/.bash_profile
     echo "PYTHON_CONFIGURE_OPTS: ${PYTHON_CONFIGURE_OPTS}"
     pyenv install 3.11.2  # tests, binary build
-    pyenv install 3.10.1  # tests
-    pyenv install 3.9.1   # tests
+    pyenv install 3.10.2  # tests
+    pyenv install 3.9.10  # tests
     pyenv rehash
   EOF
 end
@@ -309,8 +309,8 @@ def run_tests(boxname, skip_env)
     . ../borg-env/bin/activate
     if which pyenv 2> /dev/null; then
       # for testing, use the earliest point releases of the supported python versions:
-      pyenv global 3.9.1 3.10.1 3.11.2
-      pyenv local 3.9.1 3.10.1 3.11.2
+      pyenv global 3.9.10 3.10.2 3.11.2
+      pyenv local 3.9.10 3.10.2 3.11.2
     fi
     # otherwise: just use the system python
     # some OSes can only run specific test envs, e.g. because they miss FUSE support:

src/borg/testsuite/archiver/extract_cmd.py

@@ -1,6 +1,7 @@
 import errno
 import os
 import shutil
+import time
 import unittest
 from unittest.mock import patch
 
@@ -643,6 +644,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
             # make a hardlink, so it does not free the inode when unlinking input/file3
             os.link("input/file3", "hardlink-to-keep-inode-f3")
             os.remove("input/file3")
+        time.sleep(1)  # needed due to timestamp granularity of apple hfs+
         with changedir("output"):
             # now try to continue extracting, using the same archive, same output dir:
             self.cmd(f"--repo={self.repository_location}", "extract", "arch", "--continue")

tox.ini

@@ -10,7 +10,7 @@ requires =
 	wheel
 	setuptools_scm
 [testenv]
-package = editable  # without this it does not find setup_docs when running under fakeroot
+package = editable-legacy  # without this it does not find setup_docs when running under fakeroot
 setenv =
    fuse2: BORG_FUSE_IMPL=llfuse
    fuse3: BORG_FUSE_IMPL=pyfuse3