summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kupka <dkupka@redhat.com>2016-02-24 08:15:51 +0100
committerMartin Basti <mbasti@redhat.com>2016-02-24 10:37:04 +0100
commit775ee77bcc091ba31fdd3e59f8d45d0b646a44a0 (patch)
tree15edb29cbf5c7e8a4c3bcdb3ffa4e25d9474e3fb
parentef9134640795b736731bfbdb6fe0badb3e817552 (diff)
CI: Make double circle topology python3 compatible
Reviewed-By: Martin Basti <mbasti@redhat.com>
-rw-r--r--ipatests/test_integration/tasks.py2
-rw-r--r--ipatests/test_integration/test_topologies.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index 9d9a78bb1..60e9e8239 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -946,7 +946,7 @@ def double_circle_topo(master, replicas, site_size=6):
# split servers into sites
it = [iter(servers)] * site_size
- sites = map(lambda x: (x[0], x[1], x[2:]), zip(*it))
+ sites = [(x[0], x[1], x[2:]) for x in zip(*it)]
num_sites = len(sites)
for i in range(num_sites):
diff --git a/ipatests/test_integration/test_topologies.py b/ipatests/test_integration/test_topologies.py
index a0a1b9d62..4618b44fe 100644
--- a/ipatests/test_integration/test_topologies.py
+++ b/ipatests/test_integration/test_topologies.py
@@ -121,7 +121,7 @@ def test_topology_two_connected():
def test_topology_double_circle_topo():
topo = tasks.get_topo('double-circle')
assert topo == tasks.double_circle_topo
- assert list(topo('M', range(1, 30))) == [
+ assert list(topo('M', list(range(1, 30)))) == [
('M', 1),
(1, 6),
(1, 12),