IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

test_integration.config: Convert some text values to str

Browse Source 
When loading from file, some strings are loaded as unicode,
which would throw off assert_deepequal.

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Petr Viktorin 2014-01-06 10:38:24 +01:00
parent 87a36db6bc
commit e6dbb2aa68
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipatests/test_integration/config.py
View File

@ -77,8 +77,8 @@ class Config(object):
self.dirman_password = kwargs.get('dirman_password') or admin_password self.dirman_password = kwargs.get('dirman_password') or admin_password
self.dns_forwarder = kwargs.get('dns_forwarder') or '8.8.8.8' self.dns_forwarder = kwargs.get('dns_forwarder') or '8.8.8.8'
self.nis_domain = kwargs.get('nis_domain') or 'ipatest' self.nis_domain = kwargs.get('nis_domain') or 'ipatest'
self.ntp_server = kwargs.get('ntp_server') or ( self.ntp_server = str(kwargs.get('ntp_server') or (
'%s.pool.ntp.org' % random.randint(0, 3)) '%s.pool.ntp.org' % random.randint(0, 3)))
self.ad_admin_name = kwargs.get('ad_admin_name') or 'Administrator' self.ad_admin_name = kwargs.get('ad_admin_name') or 'Administrator'
self.ad_admin_password = kwargs.get('ad_admin_password') or 'Secret123' self.ad_admin_password = kwargs.get('ad_admin_password') or 'Secret123'
self.ipv6 = bool(kwargs.get('ipv6', False)) self.ipv6 = bool(kwargs.get('ipv6', False))
@ -312,10 +312,10 @@ class Domain(object):
"""Configuration for an IPA / AD domain""" """Configuration for an IPA / AD domain"""
def __init__(self, config, name, domain_type): def __init__(self, config, name, domain_type):
self.log = log_mgr.get_logger(self) self.log = log_mgr.get_logger(self)
self.type = domain_type self.type = str(domain_type)
self.config = config self.config = config
self.name = name self.name = str(name)
self.hosts = [] self.hosts = []
self.realm = self.name.upper() self.realm = self.name.upper()

8
ipatests/test_integration/host.py
View File

@ -37,12 +37,12 @@ class BaseHost(object):
def __init__(self, domain, hostname, role, ip=None, def __init__(self, domain, hostname, role, ip=None,
external_hostname=None): external_hostname=None):
self.domain = domain self.domain = domain
self.role = role self.role = str(role)
shortname, dot, ext_domain = hostname.partition('.') shortname, dot, ext_domain = hostname.partition('.')
self.shortname = shortname self.shortname = shortname
self.hostname = shortname + '.' + self.domain.name self.hostname = str(shortname + '.' + self.domain.name)
self.external_hostname = external_hostname or hostname self.external_hostname = str(external_hostname or hostname)
self.netbios = self.domain.name.split('.')[0].upper() self.netbios = self.domain.name.split('.')[0].upper()
@ -51,7 +51,7 @@ class BaseHost(object):
self.log = log_mgr.get_logger(self.logger_name) self.log = log_mgr.get_logger(self.logger_name)
if ip: if ip:
self.ip = ip self.ip = str(ip)
else: else:
if self.config.ipv6: if self.config.ipv6:
# $(dig +short $M $rrtype|tail -1) # $(dig +short $M $rrtype|tail -1)