mirror of
https://github.com/samba-team/samba.git
synced 2025-03-20 22:50:26 +03:00
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> BUG: https://bugzilla.samba.org/show_bug.cgi?id=14817 (cherry picked from commit ec5c2b040b63d06a17bcd7bd133c2d68d07df587)
This commit is contained in:
parent
b423bb95af
commit
13667701cd
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user