suite/matrix: make test_build_matrix py3 compat
@@ -24,7 +24,7 @@ class TestBuildMatrix(object):
'os.listdir',
'os.path.isfile',
'os.path.isdir',
- '__builtin__.open',
+ 'teuthology.suite.open',
]
def setup(self):
@@ -582,7 +582,7 @@ class TestSubset(object):
'os.listdir',
'os.path.isfile',
'os.path.isdir',
- '__builtin__.open',
+ 'teuthology.suite.open',
]
def setup(self):
@@ -637,9 +637,9 @@ class TestSubset(object):
sub_max_facets, max_fanout,
max_depth - 1, namegen, top=False)
if subtree is not None:
- tree[namegen.next()] = subtree
+ tree[next(namegen)] = subtree
else:
- tree[yamilify(namegen.next())] = None
+ tree[yamilify(next(namegen))] = None
random.choice([
lambda: tree.update({'%': None}),
lambda: None])()
