summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2023-11-13 13:34:57 +1300
committerAndrew Bartlett <abartlet@samba.org>2023-11-27 22:37:32 +0000
commitbc9da9568223ddfc8b70384f895c41b7cb6a9b13 (patch)
tree2812fc5a68b6c30af4e63fc2b02f14d54161f689 /python
parent4cc91d28283bcded7d2d736d39345e9c4bec6f74 (diff)
downloadsamba-bc9da9568223ddfc8b70384f895c41b7cb6a9b13.tar.gz
samba-bc9da9568223ddfc8b70384f895c41b7cb6a9b13.tar.bz2
samba-bc9da9568223ddfc8b70384f895c41b7cb6a9b13.zip
pytest: conditional_ace_claims: write_c_test_on_failure() copes with claims
*copes badly, but better than crashing. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
-rw-r--r--python/samba/tests/conditional_ace_claims.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/python/samba/tests/conditional_ace_claims.py b/python/samba/tests/conditional_ace_claims.py
index 9b2aaef259f..e7fef5aed43 100644
--- a/python/samba/tests/conditional_ace_claims.py
+++ b/python/samba/tests/conditional_ace_claims.py
@@ -20,6 +20,7 @@
from samba.dcerpc import security
from samba.security import access_check
from samba.tests.token_factory import token as Token
+from samba.dcerpc.security import CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1
from samba.tests import TestCase, DynamicTestCase, get_env_dir
from samba.colour import c_RED, c_GREEN
import os
@@ -73,10 +74,14 @@ def write_c_test_on_failure(f):
if s in token:
macro = s.upper()
for name, values in token[s].items():
- if not isinstance(values, (list, tuple)):
- values = [values]
- v = ', '.join(q(x) for x in values)
- v = q(f"{v}")
+ if isinstance(values,
+ CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1):
+ v = '...'
+ else:
+ if not isinstance(values, (list, tuple)):
+ values = [values]
+ v = ', '.join(q(x) for x in values)
+ v = q(f"{v}")
print(f'\t{macro}({q(name)}, {v});')
print(f'\tSD({q(sddl)});')
if 'allow' in f.__name__: