upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-02-20 00:10:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

tests: add some ctx managers for better cleanup

Browse source
This commit is contained in:
Thomas Waldmann 2025-11-19 20:16:41 +01:00
parent d6c334c4ec
commit 4aa63a7866
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/borg/testsuite/archiver/__init__.py
View file

@ -514,10 +514,12 @@ def fuse_mount(archiver, mountpoint=None, *options, fork=True, os_fork=False, **
# with the call to `cmd`, above.
yield
return
wait_for_mountstate(mountpoint, mounted=True)
yield
umount(mountpoint)
wait_for_mountstate(mountpoint, mounted=False)
os.rmdir(mountpoint)
try:
wait_for_mountstate(mountpoint, mounted=True)
yield
finally:
umount(mountpoint)
wait_for_mountstate(mountpoint, mounted=False)
os.rmdir(mountpoint)
# Give the daemon some time to exit
time.sleep(0.2)

10
src/borg/testsuite/platform/freebsd_test.py
View file

@ -86,11 +86,11 @@ def test_access_acl():
@skipif_acls_not_working
def test_default_acl():
tmpdir = tempfile.mkdtemp()
assert get_acl(tmpdir) == {}
set_acl(tmpdir, access=ACCESS_ACL, default=DEFAULT_ACL)
assert get_acl(tmpdir)["acl_access"] == ACCESS_ACL
assert get_acl(tmpdir)["acl_default"] == DEFAULT_ACL
with tempfile.TemporaryDirectory() as tmpdir:
assert get_acl(tmpdir) == {}
set_acl(tmpdir, access=ACCESS_ACL, default=DEFAULT_ACL)
assert get_acl(tmpdir)["acl_access"] == ACCESS_ACL
assert get_acl(tmpdir)["acl_default"] == DEFAULT_ACL
# nfs4 acls testing not implemented.

10
src/borg/testsuite/platform/linux_test.py
View file

@ -72,11 +72,11 @@ def test_access_acl():
@skipif_acls_not_working
def test_default_acl():
tmpdir = tempfile.mkdtemp()
assert get_acl(tmpdir) == {}
set_acl(tmpdir, access=ACCESS_ACL, default=DEFAULT_ACL)
assert get_acl(tmpdir)["acl_access"] == ACCESS_ACL
assert get_acl(tmpdir)["acl_default"] == DEFAULT_ACL
with tempfile.TemporaryDirectory() as tmpdir:
assert get_acl(tmpdir) == {}
set_acl(tmpdir, access=ACCESS_ACL, default=DEFAULT_ACL)
assert get_acl(tmpdir)["acl_access"] == ACCESS_ACL
assert get_acl(tmpdir)["acl_default"] == DEFAULT_ACL
@skipif_acls_not_working