From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Tue, 15 Jun 2021 03:55:17 +0000 (+1200)
Subject: tests/krb5/raw_testcase.py: Simplify conditionals
X-Git-Tag: tevent-0.11.0~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec5c2b040b63d06a17bcd7bd133c2d68d07df587;p=thirdparty%2Fsamba.git

tests/krb5/raw_testcase.py: Simplify conditionals

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

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index ade980cb46d..0e08f0ef7d2 100644
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -437,9 +437,7 @@ class RawKerberosTest(TestCaseInTempDir):
                     allow_missing=False):
         val = None
         if prefix is not None:
-            allow_missing_prefix = allow_missing
-            if fallback_default:
-                allow_missing_prefix = True
+            allow_missing_prefix = allow_missing or fallback_default
             val = samba.tests.env_get_var_value('%s_%s' % (prefix, varname),
                                     allow_missing=allow_missing_prefix)
         else:
@@ -459,9 +457,7 @@ class RawKerberosTest(TestCaseInTempDir):
 
         domain = self.env_get_var('DOMAIN', prefix)
         realm = self.env_get_var('REALM', prefix)
-        allow_missing_username = False
-        if default_username is not None:
-            allow_missing_username = True
+        allow_missing_username = default_username is not None
         username = self.env_get_var('USERNAME', prefix,
                                     fallback_default=False,
                                     allow_missing=allow_missing_username)