summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-12-06 16:39:06 +0100
committerPetr Viktorin <pviktori@redhat.com>2013-12-10 15:42:33 +0100
commitf2ee8a74032708717f8b370de5b1acc86d4d74cc (patch)
treeea377d7ccb60c8fe7aa2d49e537dc2b3e8481c9f
parentb6563984154e577cdf430f8f74f15f912ac0ee12 (diff)
downloadfreeipa-f2ee8a74032708717f8b370de5b1acc86d4d74cc.tar.gz
freeipa-f2ee8a74032708717f8b370de5b1acc86d4d74cc.tar.xz
freeipa-f2ee8a74032708717f8b370de5b1acc86d4d74cc.zip
test_webui: Allow False values in configuration for no_ca, no_dns, has_trusts
The driver only checked if the corresponding value was in the config, so no_dns: False had the same effect as no_dns: True Change the check to take the value into consideration. This makes false-y values like False (from YAML) and empty string (from environment) work as if the value was not specified.
-rw-r--r--ipatests/test_webui/ui_driver.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipatests/test_webui/ui_driver.py b/ipatests/test_webui/ui_driver.py
index 1c396b6d..cf95a8cd 100644
--- a/ipatests/test_webui/ui_driver.py
+++ b/ipatests/test_webui/ui_driver.py
@@ -241,19 +241,19 @@ class UI_driver(object):
"""
FreeIPA server was installed with CA.
"""
- return 'no_ca' not in self.config
+ return not self.config.get('no_ca')
def has_dns(self):
"""
FreeIPA server was installed with DNS.
"""
- return 'no_dns' not in self.config
+ return not self.config.get('no_dns')
def has_trusts(self):
"""
FreeIPA server was installed with Trusts.
"""
- return 'has_trusts' in self.config
+ return self.config.get('has_trusts')
def has_active_request(self):
"""