tests/krb5: Add samba.tests.krb5.conditional_ace_tests

[samba.git] / python / samba / tests / krb5 / kdc_tgs_tests.py

diff --git a/python/samba/tests/krb5/kdc_tgs_tests.py b/python/samba/tests/krb5/kdc_tgs_tests.py
index 1254ea2e0cbd8b8d8d8fb46568644ce85041cd9b..b4a21f8500a2a7c1c33b01894d38549c08d63b05 100755 (executable)
--- a/python/samba/tests/krb5/kdc_tgs_tests.py
+++ b/python/samba/tests/krb5/kdc_tgs_tests.py
@@ -193,6 +193,16 @@ class KdcTgsBaseTests(KDCBaseTest):
                  expect_requester_sid=None,
                  expect_edata=False,
                  expected_sid=None,
+                 expected_groups=None,
+                 unexpected_groups=None,
+                 expect_device_info=None,
+                 expected_device_domain_sid=None,
+                 expected_device_groups=None,
+                 expect_client_claims=None,
+                 expected_client_claims=None,
+                 unexpected_client_claims=None,
+                 expect_device_claims=None,
+                 expected_device_claims=None,
                  expect_status=None,
                  expected_status=None,
                  expected_proxy_target=None,
@@ -303,6 +313,16 @@ class KdcTgsBaseTests(KDCBaseTest):
             expect_pac_attrs_pac_request=expect_pac_attrs_pac_request,
             expect_requester_sid=expect_requester_sid,
             expected_sid=expected_sid,
+            expected_groups=expected_groups,
+            unexpected_groups=unexpected_groups,
+            expect_device_info=expect_device_info,
+            expected_device_domain_sid=expected_device_domain_sid,
+            expected_device_groups=expected_device_groups,
+            expect_client_claims=expect_client_claims,
+            expected_client_claims=expected_client_claims,
+            unexpected_client_claims=unexpected_client_claims,
+            expect_device_claims=expect_device_claims,
+            expected_device_claims=expected_device_claims,
             expected_proxy_target=expected_proxy_target,
             expected_transited_services=expected_transited_services,
             check_patypes=check_patypes)
@@ -890,9 +910,6 @@ class KdcTgsTests(KdcTgsBaseTests):
     def _run_upn_dns_info_ex_test(self, client_creds):
         service_creds = self.get_service_creds()
 
-        samdb = self.get_samdb()
-        dn = client_creds.get_dn()
-
         account_name = client_creds.get_username()
         upn_name = client_creds.get_upn()
         if upn_name is None:
@@ -2148,7 +2165,6 @@ class KdcTgsTests(KdcTgsBaseTests):
     def test_as_requester_sid(self):
         creds = self._get_creds()
 
-        samdb = self.get_samdb()
         sid = creds.get_sid()
 
         self.get_tgt(creds, pac_request=None,
@@ -2159,7 +2175,6 @@ class KdcTgsTests(KdcTgsBaseTests):
     def test_tgs_requester_sid(self):
         creds = self._get_creds()
 
-        samdb = self.get_samdb()
         sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
@@ -2173,7 +2188,6 @@ class KdcTgsTests(KdcTgsBaseTests):
     def test_tgs_requester_sid_renew(self):
         creds = self._get_creds()
 
-        samdb = self.get_samdb()
         sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
@@ -2192,7 +2206,6 @@ class KdcTgsTests(KdcTgsBaseTests):
         creds = self._get_creds(replication_allowed=True,
                                 revealed_to_rodc=True)
 
-        samdb = self.get_samdb()
         sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
@@ -2209,7 +2222,6 @@ class KdcTgsTests(KdcTgsBaseTests):
     def test_tgs_requester_sid_missing_renew(self):
         creds = self._get_creds()
 
-        samdb = self.get_samdb()
         sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
@@ -2225,7 +2237,6 @@ class KdcTgsTests(KdcTgsBaseTests):
         creds = self._get_creds(replication_allowed=True,
                                 revealed_to_rodc=True)
 
-        samdb = self.get_samdb()
         sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
@@ -2240,7 +2251,6 @@ class KdcTgsTests(KdcTgsBaseTests):
     def test_tgs_requester_sid_validate(self):
         creds = self._get_creds()
 
-        samdb = self.get_samdb()
         sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
@@ -2259,7 +2269,6 @@ class KdcTgsTests(KdcTgsBaseTests):
         creds = self._get_creds(replication_allowed=True,
                                 revealed_to_rodc=True)
 
-        samdb = self.get_samdb()
         sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
@@ -2276,7 +2285,6 @@ class KdcTgsTests(KdcTgsBaseTests):
     def test_tgs_requester_sid_missing_validate(self):
         creds = self._get_creds()
 
-        samdb = self.get_samdb()
         sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,
@@ -2292,7 +2300,6 @@ class KdcTgsTests(KdcTgsBaseTests):
         creds = self._get_creds(replication_allowed=True,
                                 revealed_to_rodc=True)
 
-        samdb = self.get_samdb()
         sid = creds.get_sid()
 
         tgt = self.get_tgt(creds, pac_request=None,