tests/krb5: Ensure that device SIDs and claims are present only if we expect them...

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/krb5/conditional_ace_tests.py b/python/samba/tests/krb5/conditional_ace_tests.py
index 3f316d6c120f73612757d48ce2e0e02f4591be1e..85ce8832178220d3c73930ab1d0f39559c8126ff 100755 (executable)
--- a/python/samba/tests/krb5/conditional_ace_tests.py
+++ b/python/samba/tests/krb5/conditional_ace_tests.py
@@ -4390,12 +4390,12 @@ class TgsReqServicePolicyTests(ConditionalAceBaseTests):
         # Show that authorization succeeds.
         self._tgs_req(client_tgt, 0, client_creds, target_creds, armor_tgt=mach_tgt,
                       expected_groups=expected_sids,
-                      expect_device_info=bool(expected_device_sids) or None,
+                      expect_device_info=bool(expected_device_sids),
                       expected_device_domain_sid=domain_sid_str,
                       expected_device_groups=expected_device_sids,
                       expect_client_claims=bool(expected_client_claims) or None,
                       expected_client_claims=expected_client_claims,
-                      expect_device_claims=bool(expected_device_claims) or None,
+                      expect_device_claims=bool(expected_device_claims),
                       expected_device_claims=expected_device_claims)
 
         self.check_tgs_log(client_creds, target_creds)