pytest:sddl: let hex numbers differ in case (0xa == 0xA)

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/sddl.py b/python/samba/tests/sddl.py
index 3bdc21383a221000ef33625c4ca0186cc3566f3f..d8618a58c4778cde1e210c297422cf52e894748b 100644 (file)
--- a/python/samba/tests/sddl.py
+++ b/python/samba/tests/sddl.py
@@ -56,7 +56,11 @@ class SddlDecodeEncodeBase(TestCase):
         sddl = sd1.as_sddl(self.domain_sid)
         sd2 = security.descriptor.from_sddl(sddl, self.domain_sid)
         self.assertEqual(sd1, sd2)
-        self.assertEqual(sddl, canonical)
+        if '0X' in canonical.upper():
+            # let's chill out about case in hex numbers.
+            self.assertEqual(sddl.upper(), canonical.upper())
+        else:
+            self.assertEqual(sddl, canonical)
 
     def _test_sddl_should_fail_with_args(self, s, canonical):
         with self.assertRaises(ValueError):

diff --git a/selftest/knownfail.d/sddl b/selftest/knownfail.d/sddl
index 212d9a3381469dd12912fa1063cc4172481fe9c8..dccf0021e8536b873d013aa73caf87e5220a0ca4 100644 (file)
--- a/selftest/knownfail.d/sddl
+++ b/selftest/knownfail.d/sddl
@@ -1,4 +1,3 @@
-^samba.tests.sddl.+.SddlNonCanonical.test_sddl_D:.A;;GA;;;S-1-5000000000-30-40..none
 ^samba.tests.sddl.+.SddlShouldFail.test_sddl_should_fail_D:.A;;0x.75bcd15;;;LG..none
 ^samba.tests.sddl.+.SddlShouldFail.test_sddl_should_fail_D:.A;;0x75bcd15       ;;;LG..none
 ^samba.tests.sddl.+.SddlShouldFail.test_sddl_should_fail_D:.A;;123456789.;;;LG..none