Ver Fonte

Merge pull request #7834 from ThomasWaldmann/fix-unreadable-dir-cleanup-master

fix post-test permission issues
TW há 1 ano atrás
pai
commit
a9e625d11f
1 ficheiros alterados com 6 adições e 3 exclusões
  1. 6 3
      src/borg/testsuite/archiver/create_cmd.py

+ 6 - 3
src/borg/testsuite/archiver/create_cmd.py

@@ -173,9 +173,12 @@ def test_create_unreadable_parent(archiver):
     os.mkdir(parent_dir)
     os.mkdir(root_dir)
     os.chmod(parent_dir, 0o111)  # --x--x--x == parent dir traversable, but not readable
-    cmd(archiver, "rcreate", "--encryption=none")
-    # issue #7746: we *can* read root_dir and we *can* traverse parent_dir, so this should work:
-    cmd(archiver, "create", "test", root_dir)
+    try:
+        cmd(archiver, "rcreate", "--encryption=none")
+        # issue #7746: we *can* read root_dir and we *can* traverse parent_dir, so this should work:
+        cmd(archiver, "create", "test", root_dir)
+    finally:
+        os.chmod(parent_dir, 0o771)  # otherwise cleanup after this test fails
 
 
 @pytest.mark.skipif(is_win32, reason="unix sockets not available on windows")