summaryrefslogtreecommitdiffstats
path: root/ipatests/test_integration/host.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-01-06 10:38:24 +0100
committerPetr Viktorin <pviktori@redhat.com>2014-03-05 10:00:58 +0100
commite6dbb2aa681f8cecfa81623ff17f4acac2b58028 (patch)
tree4faf805e46a3985cb75569c1d650004ed6814955 /ipatests/test_integration/host.py
parent87a36db6bcb701048228402887ed0c97c6fee70e (diff)
downloadfreeipa-e6dbb2aa681f8cecfa81623ff17f4acac2b58028.tar.gz
freeipa-e6dbb2aa681f8cecfa81623ff17f4acac2b58028.tar.xz
freeipa-e6dbb2aa681f8cecfa81623ff17f4acac2b58028.zip
test_integration.config: Convert some text values to str
When loading from file, some strings are loaded as unicode, which would throw off assert_deepequal. Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_integration/host.py')
-rw-r--r--ipatests/test_integration/host.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ipatests/test_integration/host.py b/ipatests/test_integration/host.py
index f78933c0c..a57e3763c 100644
--- a/ipatests/test_integration/host.py
+++ b/ipatests/test_integration/host.py
@@ -37,12 +37,12 @@ class BaseHost(object):
def __init__(self, domain, hostname, role, ip=None,
external_hostname=None):
self.domain = domain
- self.role = role
+ self.role = str(role)
shortname, dot, ext_domain = hostname.partition('.')
self.shortname = shortname
- self.hostname = shortname + '.' + self.domain.name
- self.external_hostname = external_hostname or hostname
+ self.hostname = str(shortname + '.' + self.domain.name)
+ self.external_hostname = str(external_hostname or hostname)
self.netbios = self.domain.name.split('.')[0].upper()
@@ -51,7 +51,7 @@ class BaseHost(object):
self.log = log_mgr.get_logger(self.logger_name)
if ip:
- self.ip = ip
+ self.ip = str(ip)
else:
if self.config.ipv6:
# $(dig +short $M $rrtype|tail -1)