summaryrefslogtreecommitdiff
path: root/lib/spack/spack/test/spec_yaml.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/spack/spack/test/spec_yaml.py')
-rw-r--r--lib/spack/spack/test/spec_yaml.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/spack/spack/test/spec_yaml.py b/lib/spack/spack/test/spec_yaml.py
index f9b41df19a..03129a7eb9 100644
--- a/lib/spack/spack/test/spec_yaml.py
+++ b/lib/spack/spack/test/spec_yaml.py
@@ -26,7 +26,7 @@ import spack.version
from spack import repo
from spack.spec import Spec, save_dependency_spec_yamls
from spack.util.spack_yaml import syaml_dict
-from spack.test.conftest import MockPackage, MockPackageMultiRepo
+from spack.util.mock_package import MockPackageMultiRepo
def check_yaml_round_trip(spec):
@@ -301,15 +301,14 @@ def test_save_dependency_spec_yamls_subset(tmpdir, config):
default = ('build', 'link')
- g = MockPackage('g', [], [])
- f = MockPackage('f', [], [])
- e = MockPackage('e', [], [])
- d = MockPackage('d', [f, g], [default, default])
- c = MockPackage('c', [], [])
- b = MockPackage('b', [d, e], [default, default])
- a = MockPackage('a', [b, c], [default, default])
-
- mock_repo = MockPackageMultiRepo([a, b, c, d, e, f, g])
+ mock_repo = MockPackageMultiRepo()
+ g = mock_repo.add_package('g', [], [])
+ f = mock_repo.add_package('f', [], [])
+ e = mock_repo.add_package('e', [], [])
+ d = mock_repo.add_package('d', [f, g], [default, default])
+ c = mock_repo.add_package('c', [], [])
+ b = mock_repo.add_package('b', [d, e], [default, default])
+ mock_repo.add_package('a', [b, c], [default, default])
with repo.swap(mock_repo):
spec_a = Spec('a')