CI: Make double circle topology python3 compatible

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
David Kupka 2016-02-24 08:15:51 +01:00 committed by Martin Basti
parent ef91346407
commit 775ee77bcc
2 changed files with 2 additions and 2 deletions

View File

@ -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):

View File

@ -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),