tests/krb5: Fix assertElementFlags()
authorJoseph Sutton <josephsutton@catalyst.net.nz>
Wed, 29 Sep 2021 00:03:49 +0000 (13:03 +1300)
committerStefan Metzmacher <metze@samba.org>
Mon, 25 Oct 2021 12:13:16 +0000 (12:13 +0000)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14642

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 788b3a29eea62f9f38ca8865c7cb7860bdc94bec)

python/samba/tests/krb5/fast_tests.py
python/samba/tests/krb5/raw_testcase.py

index 837a0070dc7dc63ce27e34891a551fac06f24343..ea72c35c3732fb39a2dea38b8cdb4ca3f1b4f4ce 100755 (executable)
@@ -1354,10 +1354,10 @@ class FAST_Tests(KDCBaseTest):
 
             expected_flags = kdc_dict.pop('expected_flags', 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)
             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:
                 kdc_exchange_dict = self.as_exchange_dict(
index f6aeb00dc8f358ca3a442978c2c4a92aa012388b..a24faf1d0609809ad1a845c1ee0170d6dd11a1ef 100644 (file)
@@ -1053,14 +1053,14 @@ class RawKerberosTest(TestCaseInTempDir):
         v = self.getElementValue(obj, elem)
         self.assertIsNotNone(v)
         if expected is not None:
-            self.assertIsInstance(expected, krb5_asn1.KDCOptions)
+            self.assertIsInstance(expected, krb5_asn1.TicketFlags)
             for i, flag in enumerate(expected):
                 if flag == 1:
                     self.assertEqual('1', v[i],
                                      f"'{expected.namedValues[i]}' "
                                      f"expected in {v}")
         if unexpected is not None:
-            self.assertIsInstance(unexpected, krb5_asn1.KDCOptions)
+            self.assertIsInstance(unexpected, krb5_asn1.TicketFlags)
             for i, flag in enumerate(unexpected):
                 if flag == 1:
                     self.assertEqual('0', v[i],