sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-10 12:58:35 +03:00
Code

tests/krb5: Fix assertElementFlags()

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14642
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14881

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 788b3a29eea62f9f38ca8865c7cb7860bdc94bec)
This commit is contained in:
Joseph Sutton 2021-09-29 13:03:49 +13:00 committed by Stefan Metzmacher
parent 191a0e9dbb
commit 316df8064d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/samba/tests/krb5/fast_tests.py
View File

@ -1305,10 +1305,10 @@ class FAST_Tests(KDCBaseTest):
expected_flags = kdc_dict.pop('expected_flags', None) expected_flags = kdc_dict.pop('expected_flags', None)
if expected_flags is not None: if expected_flags is not None:
expected_flags = krb5_asn1.KDCOptions(expected_flags) expected_flags = krb5_asn1.TicketFlags(expected_flags)
unexpected_flags = kdc_dict.pop('unexpected_flags', None) unexpected_flags = kdc_dict.pop('unexpected_flags', None)
if unexpected_flags is not None: if unexpected_flags is not None:
unexpected_flags = krb5_asn1.KDCOptions(unexpected_flags) unexpected_flags = krb5_asn1.TicketFlags(unexpected_flags)
if rep_type == KRB_AS_REP: if rep_type == KRB_AS_REP:
kdc_exchange_dict = self.as_exchange_dict( kdc_exchange_dict = self.as_exchange_dict(

4
python/samba/tests/krb5/raw_testcase.py
View File

@ -1053,14 +1053,14 @@ class RawKerberosTest(TestCaseInTempDir):
v = self.getElementValue(obj, elem) v = self.getElementValue(obj, elem)
self.assertIsNotNone(v) self.assertIsNotNone(v)
if expected is not None: if expected is not None:
self.assertIsInstance(expected, krb5_asn1.KDCOptions) self.assertIsInstance(expected, krb5_asn1.TicketFlags)
for i, flag in enumerate(expected): for i, flag in enumerate(expected):
if flag == 1: if flag == 1:
self.assertEqual('1', v[i], self.assertEqual('1', v[i],
f"'{expected.namedValues[i]}' " f"'{expected.namedValues[i]}' "
f"expected in {v}") f"expected in {v}")
if unexpected is not None: if unexpected is not None:
self.assertIsInstance(unexpected, krb5_asn1.KDCOptions) self.assertIsInstance(unexpected, krb5_asn1.TicketFlags)
for i, flag in enumerate(unexpected): for i, flag in enumerate(unexpected):
if flag == 1: if flag == 1:
self.assertEqual('0', v[i], self.assertEqual('0', v[i],