mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

linux: move ACL definitions to platform_linux test module 

they are only used from there.
This commit is contained in:
Thomas Waldmann 2023-08-27 02:55:52 +02:00
parent 7f8eba4fbf
commit 9c1088c95c
No known key found for this signature in database
GPG Key ID: 243ACFA951F78E01
2 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/borg/testsuite/platform.py
View File

@ -9,32 +9,6 @@ from ..platform import get_process_id, process_alive
from . import unopened_tempfile
from .locking import free_pid # NOQA
ACCESS_ACL = """
user::rw-
user:root:rw-:0
user:9999:r--:9999
group::r--
group:root:r--:0
group:9999:r--:9999
mask::rw-
other::r--
""".strip().encode(
"ascii"
)
DEFAULT_ACL = """
user::rw-
user:root:r--:0
user:8888:r--:8888
group::r--
group:root:r--:0
group:8888:r--:8888
mask::rw-
other::r--
""".strip().encode(
"ascii"
)
def fakeroot_detected():
return "FAKEROOTKEY" in os.environ

36
src/borg/testsuite/platform_linux.py
View File

@ -2,19 +2,39 @@ import os
import tempfile
from ..platform import acl_get, acl_set
from .platform import (
DEFAULT_ACL,
ACCESS_ACL,
skipif_not_linux,
skipif_fakeroot_detected,
skipif_acls_not_working,
skipif_no_ubel_user,
)
from .platform import skipif_not_linux, skipif_fakeroot_detected, skipif_acls_not_working, skipif_no_ubel_user
# set module-level skips
pytestmark = [skipif_not_linux, skipif_fakeroot_detected]
ACCESS_ACL = """\
user::rw-
user:root:rw-:0
user:9999:r--:9999
group::r--
group:root:r--:0
group:9999:r--:9999
mask::rw-
other::r--\
""".encode(
"ascii"
)
DEFAULT_ACL = """\
user::rw-
user:root:r--:0
user:8888:r--:8888
group::r--
group:root:r--:0
group:8888:r--:8888
mask::rw-
other::r--\
""".encode(
"ascii"
)
def get_acl(path, numeric_ids=False):
item = {}
acl_get(path, item, os.stat(path), numeric_ids=numeric_ids)