flake8 fixes
This commit is contained in:
Michael Kuhn
parent
1578a95982
commit
2bd1a51193
2 changed files with 83 additions and 103 deletions
|
|
@ -61,7 +61,6 @@
|
|||
can take a number of specs as input.
|
||||
|
||||
"""
|
||||
__all__ = ['topological_sort', 'graph_ascii', 'AsciiGraph', 'graph_dot']
|
||||
|
||||
from heapq import *
|
||||
|
||||
|
|
@ -71,6 +70,8 @@
|
|||
import spack
|
||||
from spack.spec import Spec
|
||||
|
||||
__all__ = ['topological_sort', 'graph_ascii', 'AsciiGraph', 'graph_dot']
|
||||
|
||||
|
||||
def topological_sort(spec, **kwargs):
|
||||
"""Topological sort for specs.
|
||||
|
|
@ -133,6 +134,7 @@ def find(seq, predicate):
|
|||
states = ('node', 'collapse', 'merge-right', 'expand-right', 'back-edge')
|
||||
NODE, COLLAPSE, MERGE_RIGHT, EXPAND_RIGHT, BACK_EDGE = states
|
||||
|
||||
|
||||
class AsciiGraph(object):
|
||||
def __init__(self):
|
||||
# These can be set after initialization or after a call to
|
||||
|
|
@ -154,18 +156,15 @@ def __init__(self):
|
|||
self._prev_state = None # State of previous line
|
||||
self._prev_index = None # Index of expansion point of prev line
|
||||
|
||||
|
||||
def _indent(self):
|
||||
self._out.write(self.indent * ' ')
|
||||
|
||||
|
||||
def _write_edge(self, string, index, sub=0):
|
||||
"""Write a colored edge to the output stream."""
|
||||
name = self._frontier[index][sub]
|
||||
edge = "@%s{%s}" % (self._name_to_color[name], string)
|
||||
self._out.write(edge)
|
||||
|
||||
|
||||
def _connect_deps(self, i, deps, label=None):
|
||||
"""Connect dependencies to existing edges in the frontier.
|
||||
|
||||
|
|
@ -200,7 +199,8 @@ def _connect_deps(self, i, deps, label=None):
|
|||
collapse = True
|
||||
if self._prev_state == EXPAND_RIGHT:
|
||||
# Special case where previous line expanded and i is off by 1.
|
||||
self._back_edge_line([], j, i+1, True, label + "-1.5 " + str((i+1,j)))
|
||||
self._back_edge_line([], j, i + 1, True,
|
||||
label + "-1.5 " + str((i + 1, j)))
|
||||
collapse = False
|
||||
|
||||
else:
|
||||
|
|
@ -208,19 +208,20 @@ def _connect_deps(self, i, deps, label=None):
|
|||
if self._prev_state == NODE and self._prev_index < i:
|
||||
i += 1
|
||||
|
||||
if i-j > 1:
|
||||
if i - j > 1:
|
||||
# We need two lines to connect if distance > 1
|
||||
self._back_edge_line([], j, i, True, label + "-1 " + str((i,j)))
|
||||
self._back_edge_line([], j, i, True,
|
||||
label + "-1 " + str((i, j)))
|
||||
collapse = False
|
||||
|
||||
self._back_edge_line([j], -1, -1, collapse, label + "-2 " + str((i,j)))
|
||||
self._back_edge_line([j], -1, -1, collapse,
|
||||
label + "-2 " + str((i, j)))
|
||||
return True
|
||||
|
||||
elif deps:
|
||||
self._frontier.insert(i, deps)
|
||||
return False
|
||||
|
||||
|
||||
def _set_state(self, state, index, label=None):
|
||||
if state not in states:
|
||||
raise ValueError("Invalid graph state!")
|
||||
|
|
@ -234,7 +235,6 @@ def _set_state(self, state, index, label=None):
|
|||
self._out.write("%-20s" % (str(label) if label else ''))
|
||||
self._out.write("%s" % self._frontier)
|
||||
|
||||
|
||||
def _back_edge_line(self, prev_ends, end, start, collapse, label=None):
|
||||
"""Write part of a backwards edge in the graph.
|
||||
|
||||
|
|
@ -288,27 +288,26 @@ def advance(to_pos, edges):
|
|||
self._indent()
|
||||
|
||||
for p in prev_ends:
|
||||
advance(p, lambda: [("| ", self._pos)] )
|
||||
advance(p+1, lambda: [("|/", self._pos)] )
|
||||
advance(p, lambda: [("| ", self._pos)]) # NOQA: ignore=E272
|
||||
advance(p + 1, lambda: [("|/", self._pos)]) # NOQA: ignore=E272
|
||||
|
||||
if end >= 0:
|
||||
advance(end + 1, lambda: [("| ", self._pos)] )
|
||||
advance(start - 1, lambda: [("|", self._pos), ("_", end)] )
|
||||
advance(end + 1, lambda: [("| ", self._pos)]) # NOQA: ignore=E272
|
||||
advance(start - 1, lambda: [("|", self._pos), ("_", end)]) # NOQA: ignore=E272
|
||||
else:
|
||||
advance(start - 1, lambda: [("| ", self._pos)] )
|
||||
advance(start - 1, lambda: [("| ", self._pos)]) # NOQA: ignore=E272
|
||||
|
||||
if start >= 0:
|
||||
advance(start, lambda: [("|", self._pos), ("/", end)] )
|
||||
advance(start, lambda: [("|", self._pos), ("/", end)]) # NOQA: ignore=E272
|
||||
|
||||
if collapse:
|
||||
advance(flen, lambda: [(" /", self._pos)] )
|
||||
advance(flen, lambda: [(" /", self._pos)]) # NOQA: ignore=E272
|
||||
else:
|
||||
advance(flen, lambda: [("| ", self._pos)] )
|
||||
advance(flen, lambda: [("| ", self._pos)]) # NOQA: ignore=E272
|
||||
|
||||
self._set_state(BACK_EDGE, end, label)
|
||||
self._out.write("\n")
|
||||
|
||||
|
||||
def _node_line(self, index, name):
|
||||
"""Writes a line with a node at index."""
|
||||
self._indent()
|
||||
|
|
@ -317,14 +316,13 @@ def _node_line(self, index, name):
|
|||
|
||||
self._out.write("%s " % self.node_character)
|
||||
|
||||
for c in range(index+1, len(self._frontier)):
|
||||
for c in range(index + 1, len(self._frontier)):
|
||||
self._write_edge("| ", c)
|
||||
|
||||
self._out.write(" %s" % name)
|
||||
self._set_state(NODE, index)
|
||||
self._out.write("\n")
|
||||
|
||||
|
||||
def _collapse_line(self, index):
|
||||
"""Write a collapsing line after a node was added at index."""
|
||||
self._indent()
|
||||
|
|
@ -336,36 +334,33 @@ def _collapse_line(self, index):
|
|||
self._set_state(COLLAPSE, index)
|
||||
self._out.write("\n")
|
||||
|
||||
|
||||
def _merge_right_line(self, index):
|
||||
"""Edge at index is same as edge to right. Merge directly with '\'"""
|
||||
self._indent()
|
||||
for c in range(index):
|
||||
self._write_edge("| ", c)
|
||||
self._write_edge("|", index)
|
||||
self._write_edge("\\", index+1)
|
||||
for c in range(index+1, len(self._frontier)):
|
||||
self._write_edge("| ", c )
|
||||
self._write_edge("\\", index + 1)
|
||||
for c in range(index + 1, len(self._frontier)):
|
||||
self._write_edge("| ", c)
|
||||
|
||||
self._set_state(MERGE_RIGHT, index)
|
||||
self._out.write("\n")
|
||||
|
||||
|
||||
def _expand_right_line(self, index):
|
||||
self._indent()
|
||||
for c in range(index):
|
||||
self._write_edge("| ", c)
|
||||
|
||||
self._write_edge("|", index)
|
||||
self._write_edge("\\", index+1)
|
||||
self._write_edge("\\", index + 1)
|
||||
|
||||
for c in range(index+2, len(self._frontier)):
|
||||
for c in range(index + 2, len(self._frontier)):
|
||||
self._write_edge(" \\", c)
|
||||
|
||||
self._set_state(EXPAND_RIGHT, index)
|
||||
self._out.write("\n")
|
||||
|
||||
|
||||
def write(self, spec, **kwargs):
|
||||
"""Write out an ascii graph of the provided spec.
|
||||
|
||||
|
|
@ -408,7 +403,8 @@ def write(self, spec, **kwargs):
|
|||
i = find(self._frontier, lambda f: len(f) > 1)
|
||||
|
||||
if i >= 0:
|
||||
# Expand frontier until there are enough columns for all children.
|
||||
# Expand frontier until there are enough columns for all
|
||||
# children.
|
||||
|
||||
# Figure out how many back connections there are and
|
||||
# sort them so we do them in order
|
||||
|
|
@ -425,8 +421,9 @@ def write(self, spec, **kwargs):
|
|||
prev_ends = []
|
||||
for j, (b, d) in enumerate(back):
|
||||
self._frontier[i].remove(d)
|
||||
if i-b > 1:
|
||||
self._back_edge_line(prev_ends, b, i, False, 'left-1')
|
||||
if i - b > 1:
|
||||
self._back_edge_line(prev_ends, b, i, False,
|
||||
'left-1')
|
||||
del prev_ends[:]
|
||||
prev_ends.append(b)
|
||||
|
||||
|
|
@ -440,12 +437,13 @@ def write(self, spec, **kwargs):
|
|||
elif len(self._frontier[i]) > 1:
|
||||
# Expand forward after doing all back connections
|
||||
|
||||
if (i+1 < len(self._frontier) and len(self._frontier[i+1]) == 1
|
||||
and self._frontier[i+1][0] in self._frontier[i]):
|
||||
if (i + 1 < len(self._frontier) and
|
||||
len(self._frontier[i + 1]) == 1 and
|
||||
self._frontier[i + 1][0] in self._frontier[i]):
|
||||
# We need to connect to the element to the right.
|
||||
# Keep lines straight by connecting directly and
|
||||
# avoiding unnecessary expand/contract.
|
||||
name = self._frontier[i+1][0]
|
||||
name = self._frontier[i + 1][0]
|
||||
self._frontier[i].remove(name)
|
||||
self._merge_right_line(i)
|
||||
|
||||
|
|
@ -459,9 +457,8 @@ def write(self, spec, **kwargs):
|
|||
self._frontier.pop(i)
|
||||
self._connect_deps(i, deps, "post-expand")
|
||||
|
||||
|
||||
# Handle any remaining back edges to the right
|
||||
j = i+1
|
||||
j = i + 1
|
||||
while j < len(self._frontier):
|
||||
deps = self._frontier.pop(j)
|
||||
if not self._connect_deps(j, deps, "back-from-right"):
|
||||
|
|
@ -479,7 +476,8 @@ def write(self, spec, **kwargs):
|
|||
# Replace node with its dependencies
|
||||
self._frontier.pop(i)
|
||||
if node.dependencies():
|
||||
deps = sorted((d.name for d in node.dependencies()), reverse=True)
|
||||
deps = sorted((d.name for d in node.dependencies()),
|
||||
reverse=True)
|
||||
self._connect_deps(i, deps, "new-deps") # anywhere.
|
||||
|
||||
elif self._frontier:
|
||||
|
|
@ -502,7 +500,6 @@ def graph_ascii(spec, **kwargs):
|
|||
graph.write(spec, color=color, out=out)
|
||||
|
||||
|
||||
|
||||
def graph_dot(*specs, **kwargs):
|
||||
"""Generate a graph in dot format of all provided specs.
|
||||
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@
|
|||
import spack.architecture
|
||||
import spack.package
|
||||
|
||||
from llnl.util.lang import list_modules
|
||||
|
||||
from spack.spec import Spec
|
||||
from spack.test.mock_packages_test import *
|
||||
|
||||
|
|
@ -51,21 +49,19 @@ def test_conflicting_package_constraints(self):
|
|||
self.assertRaises(spack.spec.UnsatisfiableVersionSpecError,
|
||||
spec.normalize)
|
||||
|
||||
|
||||
def test_preorder_node_traversal(self):
|
||||
dag = Spec('mpileaks ^zmpi')
|
||||
dag.normalize()
|
||||
|
||||
names = ['mpileaks', 'callpath', 'dyninst', 'libdwarf', 'libelf',
|
||||
'zmpi', 'fake']
|
||||
pairs = zip([0,1,2,3,4,2,3], names)
|
||||
pairs = zip([0, 1, 2, 3, 4, 2, 3], names)
|
||||
|
||||
traversal = dag.traverse()
|
||||
self.assertEqual([x.name for x in traversal], names)
|
||||
|
||||
traversal = dag.traverse(depth=True)
|
||||
self.assertEqual([(x, y.name) for x,y in traversal], pairs)
|
||||
|
||||
self.assertEqual([(x, y.name) for x, y in traversal], pairs)
|
||||
|
||||
def test_preorder_edge_traversal(self):
|
||||
dag = Spec('mpileaks ^zmpi')
|
||||
|
|
@ -73,14 +69,13 @@ def test_preorder_edge_traversal(self):
|
|||
|
||||
names = ['mpileaks', 'callpath', 'dyninst', 'libdwarf', 'libelf',
|
||||
'libelf', 'zmpi', 'fake', 'zmpi']
|
||||
pairs = zip([0,1,2,3,4,3,2,3,1], names)
|
||||
pairs = zip([0, 1, 2, 3, 4, 3, 2, 3, 1], names)
|
||||
|
||||
traversal = dag.traverse(cover='edges')
|
||||
self.assertEqual([x.name for x in traversal], names)
|
||||
|
||||
traversal = dag.traverse(cover='edges', depth=True)
|
||||
self.assertEqual([(x, y.name) for x,y in traversal], pairs)
|
||||
|
||||
self.assertEqual([(x, y.name) for x, y in traversal], pairs)
|
||||
|
||||
def test_preorder_path_traversal(self):
|
||||
dag = Spec('mpileaks ^zmpi')
|
||||
|
|
@ -88,14 +83,13 @@ def test_preorder_path_traversal(self):
|
|||
|
||||
names = ['mpileaks', 'callpath', 'dyninst', 'libdwarf', 'libelf',
|
||||
'libelf', 'zmpi', 'fake', 'zmpi', 'fake']
|
||||
pairs = zip([0,1,2,3,4,3,2,3,1,2], names)
|
||||
pairs = zip([0, 1, 2, 3, 4, 3, 2, 3, 1, 2], names)
|
||||
|
||||
traversal = dag.traverse(cover='paths')
|
||||
self.assertEqual([x.name for x in traversal], names)
|
||||
|
||||
traversal = dag.traverse(cover='paths', depth=True)
|
||||
self.assertEqual([(x, y.name) for x,y in traversal], pairs)
|
||||
|
||||
self.assertEqual([(x, y.name) for x, y in traversal], pairs)
|
||||
|
||||
def test_postorder_node_traversal(self):
|
||||
dag = Spec('mpileaks ^zmpi')
|
||||
|
|
@ -103,14 +97,13 @@ def test_postorder_node_traversal(self):
|
|||
|
||||
names = ['libelf', 'libdwarf', 'dyninst', 'fake', 'zmpi',
|
||||
'callpath', 'mpileaks']
|
||||
pairs = zip([4,3,2,3,2,1,0], names)
|
||||
pairs = zip([4, 3, 2, 3, 2, 1, 0], names)
|
||||
|
||||
traversal = dag.traverse(order='post')
|
||||
self.assertEqual([x.name for x in traversal], names)
|
||||
|
||||
traversal = dag.traverse(depth=True, order='post')
|
||||
self.assertEqual([(x, y.name) for x,y in traversal], pairs)
|
||||
|
||||
self.assertEqual([(x, y.name) for x, y in traversal], pairs)
|
||||
|
||||
def test_postorder_edge_traversal(self):
|
||||
dag = Spec('mpileaks ^zmpi')
|
||||
|
|
@ -118,14 +111,13 @@ def test_postorder_edge_traversal(self):
|
|||
|
||||
names = ['libelf', 'libdwarf', 'libelf', 'dyninst', 'fake', 'zmpi',
|
||||
'callpath', 'zmpi', 'mpileaks']
|
||||
pairs = zip([4,3,3,2,3,2,1,1,0], names)
|
||||
pairs = zip([4, 3, 3, 2, 3, 2, 1, 1, 0], names)
|
||||
|
||||
traversal = dag.traverse(cover='edges', order='post')
|
||||
self.assertEqual([x.name for x in traversal], names)
|
||||
|
||||
traversal = dag.traverse(cover='edges', depth=True, order='post')
|
||||
self.assertEqual([(x, y.name) for x,y in traversal], pairs)
|
||||
|
||||
self.assertEqual([(x, y.name) for x, y in traversal], pairs)
|
||||
|
||||
def test_postorder_path_traversal(self):
|
||||
dag = Spec('mpileaks ^zmpi')
|
||||
|
|
@ -133,14 +125,13 @@ def test_postorder_path_traversal(self):
|
|||
|
||||
names = ['libelf', 'libdwarf', 'libelf', 'dyninst', 'fake', 'zmpi',
|
||||
'callpath', 'fake', 'zmpi', 'mpileaks']
|
||||
pairs = zip([4,3,3,2,3,2,1,2,1,0], names)
|
||||
pairs = zip([4, 3, 3, 2, 3, 2, 1, 2, 1, 0], names)
|
||||
|
||||
traversal = dag.traverse(cover='paths', order='post')
|
||||
self.assertEqual([x.name for x in traversal], names)
|
||||
|
||||
traversal = dag.traverse(cover='paths', depth=True, order='post')
|
||||
self.assertEqual([(x, y.name) for x,y in traversal], pairs)
|
||||
|
||||
self.assertEqual([(x, y.name) for x, y in traversal], pairs)
|
||||
|
||||
def test_conflicting_spec_constraints(self):
|
||||
mpileaks = Spec('mpileaks ^mpich ^callpath ^dyninst ^libelf ^libdwarf')
|
||||
|
|
@ -155,7 +146,6 @@ def test_conflicting_spec_constraints(self):
|
|||
self.assertRaises(spack.spec.InconsistentSpecError,
|
||||
lambda: mpileaks.flat_dependencies(copy=False))
|
||||
|
||||
|
||||
def test_normalize_twice(self):
|
||||
"""Make sure normalize can be run twice on the same spec,
|
||||
and that it is idempotent."""
|
||||
|
|
@ -166,7 +156,6 @@ def test_normalize_twice(self):
|
|||
spec.normalize()
|
||||
self.assertEqual(n1, spec)
|
||||
|
||||
|
||||
def test_normalize_a_lot(self):
|
||||
spec = Spec('mpileaks')
|
||||
spec.normalize()
|
||||
|
|
@ -174,7 +163,6 @@ def test_normalize_a_lot(self):
|
|||
spec.normalize()
|
||||
spec.normalize()
|
||||
|
||||
|
||||
def test_normalize_with_virtual_spec(self):
|
||||
dag = Spec('mpileaks',
|
||||
Spec('callpath',
|
||||
|
|
@ -189,14 +177,13 @@ def test_normalize_with_virtual_spec(self):
|
|||
# make sure nothing with the same name occurs twice
|
||||
counts = {}
|
||||
for spec in dag.traverse(key=id):
|
||||
if not spec.name in counts:
|
||||
if spec.name not in counts:
|
||||
counts[spec.name] = 0
|
||||
counts[spec.name] += 1
|
||||
|
||||
for name in counts:
|
||||
self.assertEqual(counts[name], 1, "Count for %s was not 1!" % name)
|
||||
|
||||
|
||||
def check_links(self, spec_to_check):
|
||||
for spec in spec_to_check.traverse():
|
||||
for dependent in spec.dependents():
|
||||
|
|
@ -211,7 +198,6 @@ def check_links(self, spec_to_check):
|
|||
"%s not in dependents of %s" %
|
||||
(spec.name, dependency.name))
|
||||
|
||||
|
||||
def test_dependents_and_dependencies_are_correct(self):
|
||||
spec = Spec('mpileaks',
|
||||
Spec('callpath',
|
||||
|
|
@ -226,43 +212,45 @@ def test_dependents_and_dependencies_are_correct(self):
|
|||
spec.normalize()
|
||||
self.check_links(spec)
|
||||
|
||||
|
||||
def test_unsatisfiable_version(self):
|
||||
self.set_pkg_dep('mpileaks', 'mpich@1.0')
|
||||
spec = Spec('mpileaks ^mpich@2.0 ^callpath ^dyninst ^libelf ^libdwarf')
|
||||
self.assertRaises(spack.spec.UnsatisfiableVersionSpecError, spec.normalize)
|
||||
|
||||
self.assertRaises(spack.spec.UnsatisfiableVersionSpecError,
|
||||
spec.normalize)
|
||||
|
||||
def test_unsatisfiable_compiler(self):
|
||||
self.set_pkg_dep('mpileaks', 'mpich%gcc')
|
||||
spec = Spec('mpileaks ^mpich%intel ^callpath ^dyninst ^libelf ^libdwarf')
|
||||
self.assertRaises(spack.spec.UnsatisfiableCompilerSpecError, spec.normalize)
|
||||
|
||||
spec = Spec('mpileaks ^mpich%intel ^callpath ^dyninst ^libelf'
|
||||
' ^libdwarf')
|
||||
self.assertRaises(spack.spec.UnsatisfiableCompilerSpecError,
|
||||
spec.normalize)
|
||||
|
||||
def test_unsatisfiable_compiler_version(self):
|
||||
self.set_pkg_dep('mpileaks', 'mpich%gcc@4.6')
|
||||
spec = Spec('mpileaks ^mpich%gcc@4.5 ^callpath ^dyninst ^libelf ^libdwarf')
|
||||
self.assertRaises(spack.spec.UnsatisfiableCompilerSpecError, spec.normalize)
|
||||
|
||||
spec = Spec('mpileaks ^mpich%gcc@4.5 ^callpath ^dyninst ^libelf'
|
||||
' ^libdwarf')
|
||||
self.assertRaises(spack.spec.UnsatisfiableCompilerSpecError,
|
||||
spec.normalize)
|
||||
|
||||
def test_unsatisfiable_architecture(self):
|
||||
platform = spack.architecture.platform()
|
||||
|
||||
self.set_pkg_dep('mpileaks', 'mpich platform=test target=be')
|
||||
spec = Spec('mpileaks ^mpich platform=test target=fe ^callpath ^dyninst ^libelf ^libdwarf')
|
||||
self.assertRaises(spack.spec.UnsatisfiableArchitectureSpecError, spec.normalize)
|
||||
|
||||
spec = Spec('mpileaks ^mpich platform=test target=fe ^callpath'
|
||||
' ^dyninst ^libelf ^libdwarf')
|
||||
self.assertRaises(spack.spec.UnsatisfiableArchitectureSpecError,
|
||||
spec.normalize)
|
||||
|
||||
def test_invalid_dep(self):
|
||||
spec = Spec('libelf ^mpich')
|
||||
self.assertRaises(spack.spec.InvalidDependencyException, spec.normalize)
|
||||
self.assertRaises(spack.spec.InvalidDependencyException,
|
||||
spec.normalize)
|
||||
|
||||
spec = Spec('libelf ^libdwarf')
|
||||
self.assertRaises(spack.spec.InvalidDependencyException, spec.normalize)
|
||||
self.assertRaises(spack.spec.InvalidDependencyException,
|
||||
spec.normalize)
|
||||
|
||||
spec = Spec('mpich ^dyninst ^libelf')
|
||||
self.assertRaises(spack.spec.InvalidDependencyException, spec.normalize)
|
||||
|
||||
self.assertRaises(spack.spec.InvalidDependencyException,
|
||||
spec.normalize)
|
||||
|
||||
def test_equal(self):
|
||||
# Different spec structures to test for equality
|
||||
|
|
@ -301,10 +289,10 @@ def test_equal(self):
|
|||
self.assertFalse(flip_flat.eq_dag(flip_dag))
|
||||
self.assertFalse(dag.eq_dag(flip_dag))
|
||||
|
||||
|
||||
def test_normalize_mpileaks(self):
|
||||
# Spec parsed in from a string
|
||||
spec = Spec('mpileaks ^mpich ^callpath ^dyninst ^libelf@1.8.11 ^libdwarf')
|
||||
spec = Spec('mpileaks ^mpich ^callpath ^dyninst ^libelf@1.8.11'
|
||||
' ^libdwarf')
|
||||
|
||||
# What that spec should look like after parsing
|
||||
expected_flat = Spec(
|
||||
|
|
@ -367,7 +355,6 @@ def test_normalize_mpileaks(self):
|
|||
self.assertEqual(spec, non_unique_nodes)
|
||||
self.assertFalse(spec.eq_dag(non_unique_nodes))
|
||||
|
||||
|
||||
def test_normalize_with_virtual_package(self):
|
||||
spec = Spec('mpileaks ^mpi ^libelf@1.8.11 ^libdwarf')
|
||||
spec.normalize()
|
||||
|
|
@ -383,7 +370,6 @@ def test_normalize_with_virtual_package(self):
|
|||
|
||||
self.assertEqual(str(spec), str(expected_normalized))
|
||||
|
||||
|
||||
def test_contains(self):
|
||||
spec = Spec('mpileaks ^mpi ^libelf@1.8.11 ^libdwarf')
|
||||
self.assertTrue(Spec('mpi') in spec)
|
||||
|
|
@ -394,7 +380,6 @@ def test_contains(self):
|
|||
self.assertFalse(Spec('libgoblin') in spec)
|
||||
self.assertTrue(Spec('mpileaks') in spec)
|
||||
|
||||
|
||||
def test_copy_simple(self):
|
||||
orig = Spec('mpileaks')
|
||||
copy = orig.copy()
|
||||
|
|
@ -411,7 +396,6 @@ def test_copy_simple(self):
|
|||
copy_ids = set(id(s) for s in copy.traverse())
|
||||
self.assertFalse(orig_ids.intersection(copy_ids))
|
||||
|
||||
|
||||
def test_copy_normalized(self):
|
||||
orig = Spec('mpileaks')
|
||||
orig.normalize()
|
||||
|
|
@ -429,7 +413,6 @@ def test_copy_normalized(self):
|
|||
copy_ids = set(id(s) for s in copy.traverse())
|
||||
self.assertFalse(orig_ids.intersection(copy_ids))
|
||||
|
||||
|
||||
def test_copy_concretized(self):
|
||||
orig = Spec('mpileaks')
|
||||
orig.concretize()
|
||||
|
|
|
|||
Loading…
Reference in a new issue